You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/05/16 04:30:15 UTC
[3/8] git commit: Add --resolve-ip option to 'nodetool ring'
Add --resolve-ip option to 'nodetool ring'
patch by Yasuharu Goto; revised by Mikhail Stepura for CASSANDRA-7210
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a01eb5a9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a01eb5a9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a01eb5a9
Branch: refs/heads/trunk
Commit: a01eb5a9458e03e7e53509d738b8717d0975141b
Parents: 569177f
Author: Yasuharu Goto <ma...@gmail.com>
Authored: Thu May 15 19:21:20 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu May 15 19:27:01 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeCmd.java | 13 +++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a01eb5a9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 285efd1..30e45c1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@
* cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172)
* Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
* Fix the InvertedIndex trigger example (CASSANDRA-7211)
+ * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
2.0.8
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a01eb5a9/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 b79a037..1af1ec8 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -250,7 +250,7 @@ public class NodeCmd
* @param outs
* the stream to write to
*/
- public void printRing(PrintStream outs, String keyspace)
+ public void printRing(PrintStream outs, String keyspace, boolean resolveIp)
{
Map<String, String> tokensToEndpoints = probe.getTokenToEndpointMap();
LinkedHashMultimap<String, String> endpointsToTokens = LinkedHashMultimap.create();
@@ -285,7 +285,7 @@ public class NodeCmd
try
{
outs.println();
- for (Entry<String, SetHostStat> entry : getOwnershipByDc(false, tokensToEndpoints, ownerships).entrySet())
+ for (Entry<String, SetHostStat> entry : getOwnershipByDc(resolveIp, tokensToEndpoints, ownerships).entrySet())
printDc(outs, format, entry.getKey(), endpointsToTokens, keyspaceSelected, entry.getValue());
}
catch (UnknownHostException e)
@@ -362,7 +362,7 @@ public class NodeCmd
? loadMap.get(endpoint)
: "?";
String owns = stat.owns != null ? new DecimalFormat("##0.00%").format(stat.owns) : "?";
- outs.printf(format, endpoint, rack, status, state, load, owns, stat.token);
+ outs.printf(format, stat.ipOrDns(), rack, status, state, load, owns, stat.token);
}
outs.println();
}
@@ -1216,8 +1216,9 @@ public class NodeCmd
switch (command)
{
case RING :
- if (arguments.length > 0) { nodeCmd.printRing(System.out, arguments[0]); }
- else { nodeCmd.printRing(System.out, null); };
+ boolean resolveIp = cmd.hasOption(RESOLVE_IP.left);
+ if (arguments.length > 0) { nodeCmd.printRing(System.out, arguments[0], resolveIp); }
+ else { nodeCmd.printRing(System.out, null, resolveIp); };
break;
case INFO : nodeCmd.printInfo(System.out, cmd); break;
@@ -1257,7 +1258,7 @@ public class NodeCmd
break;
case STATUS :
- boolean resolveIp = cmd.hasOption(RESOLVE_IP.left);
+ resolveIp = cmd.hasOption(RESOLVE_IP.left);
if (arguments.length > 0) nodeCmd.printClusterStatus(System.out, arguments[0], resolveIp);
else nodeCmd.printClusterStatus(System.out, null, resolveIp);
break;