cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Tue, 04 Oct 2016 13:37:58 GMT
Merge branch 'cassandra-3.X' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49b0805c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49b0805c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49b0805c

Branch: refs/heads/trunk
Commit: 49b0805c2a1e779d766085a1178837f0b3081971
Parents: c819cb8 af60ca9
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Tue Oct 4 14:37:32 2016 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Tue Oct 4 14:37:32 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 .../apache/cassandra/dht/tokenallocator/TokenAllocation.java   | 6 +++---
 test/unit/org/apache/cassandra/dht/BootStrapperTest.java       | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/49b0805c/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/49b0805c/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/dht/BootStrapperTest.java
index 715f7dd,3af52e5..ab0beb8
--- a/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
+++ b/test/unit/org/apache/cassandra/dht/BootStrapperTest.java
@@@ -179,15 -178,8 +179,15 @@@ public class BootStrapperTes
              int vn = 16;
              String ks = "BootStrapperTestNTSKeyspace" + rackCount + replicas;
              String dc = "1";
 +
 +            // Register peers with expected DC for NetworkTopologyStrategy.
 +            TokenMetadata metadata = StorageService.instance.getTokenMetadata();
 +            metadata.clearUnsafe();
 +            metadata.updateHostId(UUID.randomUUID(), InetAddress.getByName("127.1.0.99"));
 +            metadata.updateHostId(UUID.randomUUID(), InetAddress.getByName("127.15.0.99"));
 +
              SchemaLoader.createKeyspace(ks, KeyspaceParams.nts(dc, replicas, "15", 15),
SchemaLoader.standardCFMD(ks, "Standard1"));
-             TokenMetadata tm = new TokenMetadata();
+             TokenMetadata tm = StorageService.instance.getTokenMetadata();
              tm.clearUnsafe();
              for (int i = 0; i < rackCount; ++i)
                  generateFakeEndpoints(tm, 10, vn, dc, Integer.toString(i));


Mime
View raw message