Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71171bba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71171bba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71171bba Branch: refs/heads/cassandra-3.0 Commit: 71171bba60eb9305ce5b2cc6a3ec3af5e3e56f82 Parents: 1f62608 d719506 Author: Yuki Morishita <[email protected]> Authored: Wed Feb 10 17:37:49 2016 -0600 Committer: Yuki Morishita <[email protected]> Committed: Wed Feb 10 17:37:49 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 32 +++++++++++--------- 2 files changed, 19 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71171bba/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/71171bba/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 288a82e,d305021..259bd10 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -4153,9 -4073,10 +4156,10 @@@ public class StorageService extends Not for (Collection<InetAddress> endpoints : sortedDcsToEndpoints.values()) endpointsGroupedByDc.add(endpoints); - Map<Token, Float> tokenOwnership = getPartitioner().describeOwnership(tokenMetadata.sortedTokens()); + Map<Token, Float> tokenOwnership = tokenMetadata.partitioner.describeOwnership(tokenMetadata.sortedTokens()); LinkedHashMap<InetAddress, Float> finalOwnership = Maps.newLinkedHashMap(); + Multimap<InetAddress, Range<Token>> endpointToRanges = strategy.getAddressRanges(); // calculate ownership per dc for (Collection<InetAddress> endpoints : endpointsGroupedByDc) {
