Repository: cassandra Updated Branches: refs/heads/trunk cb67bfc16 -> a8be43e45
Rename nodetool --with-port to --print-port to disambiguate from --port Patch by Ariel Weisberg; Reviewed by Stefan Podkowinski for CASSANDRA-14392 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8be43e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8be43e4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8be43e4 Branch: refs/heads/trunk Commit: a8be43e45424950abaabed4e450d125e91ecaab2 Parents: cb67bfc Author: Ariel Weisberg <aweisb...@apple.com> Authored: Tue Apr 17 12:35:38 2018 -0400 Committer: Ariel Weisberg <aweisb...@apple.com> Committed: Thu Apr 19 18:20:15 2018 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++-- .../cassandra/tools/nodetool/DescribeCluster.java | 2 +- .../cassandra/tools/nodetool/DescribeRing.java | 2 +- .../tools/nodetool/FailureDetectorInfo.java | 2 +- .../cassandra/tools/nodetool/GetEndpoints.java | 2 +- .../cassandra/tools/nodetool/GossipInfo.java | 2 +- .../apache/cassandra/tools/nodetool/NetStats.java | 8 ++++---- .../cassandra/tools/nodetool/RemoveNode.java | 4 ++-- .../org/apache/cassandra/tools/nodetool/Ring.java | 4 ++-- .../apache/cassandra/tools/nodetool/Status.java | 18 +++++++++--------- 11 files changed, 25 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8be43e4/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index a8dbbba..7d9769c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Rename nodetool --with-port to --print-port to disambiguate from --port (CASSANDRA-14392) * Client TOPOLOGY_CHANGE messages have wrong port. (CASSANDRA-14398) * Add ability to load new SSTables from a separate directory (CASSANDRA-6719) * Eliminate background repair and probablistic read_repair_chance table options http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8be43e4/src/java/org/apache/cassandra/tools/NodeTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java index d4cc291..fb9204c 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -253,8 +253,8 @@ public class NodeTool @Option(type = OptionType.GLOBAL, name = {"-pwf", "--password-file"}, description = "Path to the JMX password file") private String passwordFilePath = EMPTY; - @Option(type = OptionType.GLOBAL, name = { "-wp", "--with-port"}, description = "Operate in 4.0 mode with hosts disambiguated by port number", arity = 0) - protected boolean withPort = false; + @Option(type = OptionType.GLOBAL, name = { "-pp", "--print-port"}, description = "Operate in 4.0 mode with hosts disambiguated by port number", arity = 0) + protected boolean printPort = false; @Override public void run() http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8be43e4/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java b/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java index da02db6..fe33551 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DescribeCluster.java @@ -59,7 +59,7 @@ public class DescribeCluster extends NodeToolCmd // display schema version for each node System.out.println("\tSchema versions:"); - Map<String, List<String>> schemaVersions = withPort ? probe.getSpProxy().getSchemaVersionsWithPort() : probe.getSpProxy().getSchemaVersions(); + Map<String, List<String>> schemaVersions = printPort ? probe.getSpProxy().getSchemaVersionsWithPort() : probe.getSpProxy().getSchemaVersions(); for (String version : schemaVersions.keySet()) { System.out.println(format("\t\t%s: %s%n", version, schemaVersions.get(version))); http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8be43e4/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java b/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java index c57e54d..ef8c97e 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java +++ b/src/java/org/apache/cassandra/tools/nodetool/DescribeRing.java @@ -39,7 +39,7 @@ public class DescribeRing extends NodeToolCmd System.out.println("TokenRange: "); try { - for (String tokenRangeString : probe.describeRing(keyspace, withPort)) + for (String tokenRangeString : probe.describeRing(keyspace, printPort)) { System.out.println("\t" + tokenRangeString); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8be43e4/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java b/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java index 896663d..c1b2192 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java +++ b/src/java/org/apache/cassandra/tools/nodetool/FailureDetectorInfo.java @@ -33,7 +33,7 @@ public class FailureDetectorInfo extends NodeToolCmd @Override public void execute(NodeProbe probe) { - TabularData data = probe.getFailureDetectorPhilValues(withPort); + TabularData data = probe.getFailureDetectorPhilValues(printPort); System.out.printf("%10s,%16s%n", "Endpoint", "Phi"); for (Object o : data.keySet()) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8be43e4/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java b/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java index c0adb2a..78065c4 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GetEndpoints.java @@ -42,7 +42,7 @@ public class GetEndpoints extends NodeToolCmd String table = args.get(1); String key = args.get(2); - if (withPort) + if (printPort) { for (String endpoint : probe.getEndpointsWithPort(ks, table, key)) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8be43e4/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java b/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java index 182c395..24c0634 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java +++ b/src/java/org/apache/cassandra/tools/nodetool/GossipInfo.java @@ -28,6 +28,6 @@ public class GossipInfo extends NodeToolCmd @Override public void execute(NodeProbe probe) { - System.out.println(probe.getGossipInfo(withPort)); + System.out.println(probe.getGossipInfo(printPort)); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8be43e4/src/java/org/apache/cassandra/tools/nodetool/NetStats.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/NetStats.java b/src/java/org/apache/cassandra/tools/nodetool/NetStats.java index 2702d9e..73e1a35 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/NetStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/NetStats.java @@ -50,11 +50,11 @@ public class NetStats extends NodeToolCmd System.out.printf("%s %s%n", status.streamOperation.getDescription(), status.planId.toString()); for (SessionInfo info : status.sessions) { - System.out.printf(" %s", info.peer.toString(withPort)); + System.out.printf(" %s", info.peer.toString(printPort)); // print private IP when it is used if (!info.peer.equals(info.connecting)) { - System.out.printf(" (using %s)", info.connecting.toString(withPort)); + System.out.printf(" (using %s)", info.connecting.toString(printPort)); } System.out.printf("%n"); if (!info.receivingSummaries.isEmpty()) @@ -65,7 +65,7 @@ public class NetStats extends NodeToolCmd System.out.printf(" Receiving %d files, %d bytes total. Already received %d files, %d bytes total%n", info.getTotalFilesToReceive(), info.getTotalSizeToReceive(), info.getTotalFilesReceived(), info.getTotalSizeReceived()); for (ProgressInfo progress : info.getReceivingFiles()) { - System.out.printf(" %s%n", progress.toString(withPort)); + System.out.printf(" %s%n", progress.toString(printPort)); } } if (!info.sendingSummaries.isEmpty()) @@ -76,7 +76,7 @@ public class NetStats extends NodeToolCmd System.out.printf(" Sending %d files, %d bytes total. Already sent %d files, %d bytes total%n", info.getTotalFilesToSend(), info.getTotalSizeToSend(), info.getTotalFilesSent(), info.getTotalSizeSent()); for (ProgressInfo progress : info.getSendingFiles()) { - System.out.printf(" %s%n", progress.toString(withPort)); + System.out.printf(" %s%n", progress.toString(printPort)); } } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8be43e4/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java b/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java index bd40aba..0acb313 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java +++ b/src/java/org/apache/cassandra/tools/nodetool/RemoveNode.java @@ -36,10 +36,10 @@ public class RemoveNode extends NodeToolCmd switch (removeOperation) { case "status": - System.out.println("RemovalStatus: " + probe.getRemovalStatus(withPort)); + System.out.println("RemovalStatus: " + probe.getRemovalStatus(printPort)); break; case "force": - System.out.println("RemovalStatus: " + probe.getRemovalStatus(withPort)); + System.out.println("RemovalStatus: " + probe.getRemovalStatus(printPort)); probe.forceRemoveCompletion(); break; default: http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8be43e4/src/java/org/apache/cassandra/tools/nodetool/Ring.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Ring.java b/src/java/org/apache/cassandra/tools/nodetool/Ring.java index 105726c..20cb890 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Ring.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Ring.java @@ -53,7 +53,7 @@ public class Ring extends NodeToolCmd { try { - Map<String, String> tokensToEndpoints = probe.getTokenToEndpointMap(withPort); + Map<String, String> tokensToEndpoints = probe.getTokenToEndpointMap(printPort); LinkedHashMultimap<String, String> endpointsToTokens = LinkedHashMultimap.create(); boolean haveVnodes = false; for (Map.Entry<String, String> entry : tokensToEndpoints.entrySet()) @@ -77,7 +77,7 @@ public class Ring extends NodeToolCmd StringBuilder errors = new StringBuilder(); boolean showEffectiveOwnership = true; - if (withPort) + if (printPort) { // Calculate per-token ownership of the ring Map<String, Float> ownerships; http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8be43e4/src/java/org/apache/cassandra/tools/nodetool/Status.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/Status.java b/src/java/org/apache/cassandra/tools/nodetool/Status.java index b2f9c19..b80940f 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/Status.java +++ b/src/java/org/apache/cassandra/tools/nodetool/Status.java @@ -56,19 +56,19 @@ public class Status extends NodeToolCmd @Override public void execute(NodeProbe probe) { - joiningNodes = probe.getJoiningNodes(withPort); - leavingNodes = probe.getLeavingNodes(withPort); - movingNodes = probe.getMovingNodes(withPort); - loadMap = probe.getLoadMap(withPort); - Map<String, String> tokensToEndpoints = probe.getTokenToEndpointMap(withPort); - liveNodes = probe.getLiveNodes(withPort); - unreachableNodes = probe.getUnreachableNodes(withPort); - hostIDMap = probe.getHostIdMap(withPort); + joiningNodes = probe.getJoiningNodes(printPort); + leavingNodes = probe.getLeavingNodes(printPort); + movingNodes = probe.getMovingNodes(printPort); + loadMap = probe.getLoadMap(printPort); + Map<String, String> tokensToEndpoints = probe.getTokenToEndpointMap(printPort); + liveNodes = probe.getLiveNodes(printPort); + unreachableNodes = probe.getUnreachableNodes(printPort); + hostIDMap = probe.getHostIdMap(printPort); epSnitchInfo = probe.getEndpointSnitchInfoProxy(); StringBuilder errors = new StringBuilder(); - if (withPort) + if (printPort) { Map<String, Float> ownerships = null; boolean hasEffectiveOwns = false; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
