Updated Branches: refs/heads/trunk 8dfe36c78 -> c22dd0821
fixes for #3047 patch by Sam Overton; reviewed by jbellis for CASSANDRA-4429 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c22dd082 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c22dd082 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c22dd082 Branch: refs/heads/trunk Commit: c22dd08218ba4ef35b90d491fdd2e78c8e28f067 Parents: 8dfe36c Author: Jonathan Ellis <[email protected]> Authored: Mon Jul 9 10:36:24 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jul 9 10:36:40 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 6 ++++-- src/java/org/apache/cassandra/tools/NodeCmd.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c22dd082/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index e196f7c..ce14352 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -2768,17 +2768,19 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe if (keyspace == null && !hasSameReplication(Schema.instance.getNonSystemTables())) throw new ConfigurationException("Non System keyspaces doesnt have the same topology"); + TokenMetadata metadata = tokenMetadata.cloneOnlyTokenMap(); + if (keyspace == null) keyspace = Schema.instance.getNonSystemTables().get(0); - final BiMap<InetAddress, Token> endpointsToTokens = ImmutableBiMap.copyOf(tokenMetadata.getTokenToEndpointMapForReading()).inverse(); + final BiMap<InetAddress, Token> endpointsToTokens = ImmutableBiMap.copyOf(metadata.getTokenToEndpointMapForReading()).inverse(); Collection<Collection<InetAddress>> endpointsGroupedByDc = new ArrayList<Collection<InetAddress>>(); if (isDcAwareReplicationStrategy(keyspace)) { // mapping of dc's to nodes, use sorted map so that we get dcs sorted SortedMap<String, Collection<InetAddress>> sortedDcsToEndpoints = new TreeMap<String, Collection<InetAddress>>(); - sortedDcsToEndpoints.putAll(tokenMetadata.getTopology().getDatacenterEndpoints().asMap()); + sortedDcsToEndpoints.putAll(metadata.getTopology().getDatacenterEndpoints().asMap()); for (Collection<InetAddress> endpoints : sortedDcsToEndpoints.values()) endpointsGroupedByDc.add(endpoints); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/c22dd082/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java index 808494e..2a732cf 100644 --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@ -319,7 +319,7 @@ public class NodeCmd ? loadMap.get(endpoint) : "?"; String owns = new DecimalFormat("##0.00%").format(entry.getValue()); - outs.printf(format, entry.getKey(), rack, status, state, load, owns, token); + outs.printf(format, endpoint, rack, status, state, load, owns, token); } outs.println(); }
