You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by vi...@apache.org on 2014/03/10 03:16:16 UTC
[1/4] git commit: nodetool no longer shows node joining patch by
driftx; reviewed by Vijay for CASSANDRA-6811
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 5310f26d4 -> 7bc4f5dc3
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57f6f929
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57f6f929
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57f6f929
Branch: refs/heads/cassandra-2.1
Commit: 57f6f9291d5d8351dce2d493e87fdc5e62c4ebcd
Parents: 1e1129c
Author: Vijay <vi...@gmail.com>
Authored: Sun Mar 9 13:55:32 2014 -0700
Committer: Vijay <vi...@gmail.com>
Committed: Sun Mar 9 13:55:32 2014 -0700
----------------------------------------------------------------------
.../org/apache/cassandra/tools/NodeCmd.java | 71 +++++++++++---------
1 file changed, 39 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/57f6f929/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 e14ba1a..75af915 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -328,42 +328,49 @@ public class NodeCmd
else
outs.println();
- for (Map.Entry<InetAddress, Float> entry : filteredOwnerships.entrySet())
+ for (Map.Entry<String, String> entry : endpointsToTokens.entries())
{
- String endpoint = entry.getKey().getHostAddress();
- for (String token : endpointsToTokens.get(endpoint))
+ String endpoint = entry.getKey();
+ String rack;
+ try
{
- String rack;
- try
- {
- rack = probe.getEndpointSnitchInfoProxy().getRack(endpoint);
- }
- catch (UnknownHostException e)
- {
- rack = "Unknown";
- }
+ rack = probe.getEndpointSnitchInfoProxy().getRack(endpoint);
+ }
+ catch (UnknownHostException e)
+ {
+ rack = "Unknown";
+ }
- String status = liveNodes.contains(endpoint)
- ? "Up"
- : deadNodes.contains(endpoint)
- ? "Down"
- : "?";
-
- String state = "Normal";
-
- if (joiningNodes.contains(endpoint))
- state = "Joining";
- else if (leavingNodes.contains(endpoint))
- state = "Leaving";
- else if (movingNodes.contains(endpoint))
- state = "Moving";
-
- String load = loadMap.containsKey(endpoint)
- ? loadMap.get(endpoint)
- : "?";
- String owns = new DecimalFormat("##0.00%").format(entry.getValue());
- outs.printf(format, endpoint, rack, status, state, load, owns, token);
+ String status = liveNodes.contains(endpoint)
+ ? "Up"
+ : deadNodes.contains(endpoint)
+ ? "Down"
+ : "?";
+
+ String state = "Normal";
+
+ if (joiningNodes.contains(endpoint))
+ state = "Joining";
+ else if (leavingNodes.contains(endpoint))
+ state = "Leaving";
+ else if (movingNodes.contains(endpoint))
+ state = "Moving";
+
+ String load = loadMap.containsKey(endpoint)
+ ? loadMap.get(endpoint)
+ : "?";
+ String owns;
+ try
+ {
+ InetAddress ep = InetAddress.getByName(endpoint);
+ Float percent = filteredOwnerships.get(ep);
+ owns = (percent != null) ? new DecimalFormat("##0.00%").format(percent) : "?";
+ }
+ catch (UnknownHostException e)
+ {
+ throw new RuntimeException(e);
}
+ outs.printf(format, endpoint, rack, status, state, load, owns, entry.getValue());
}
outs.println();
}
[3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by vi...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/tools/NodeCmd.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb6a7b42
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb6a7b42
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb6a7b42
Branch: refs/heads/cassandra-2.1
Commit: eb6a7b4285878a869dccd96b8cf3a893aa36a406
Parents: 5310f26 8d2c3fe
Author: Vijay <vi...@gmail.com>
Authored: Sun Mar 9 19:15:45 2014 -0700
Committer: Vijay <vi...@gmail.com>
Committed: Sun Mar 9 19:15:45 2014 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by vi...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d2c3fe6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d2c3fe6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d2c3fe6
Branch: refs/heads/cassandra-2.1
Commit: 8d2c3fe6737c208a889f8516eb86a8568a5916c5
Parents: 8f0952e 57f6f92
Author: Vijay <vi...@gmail.com>
Authored: Sun Mar 9 14:00:17 2014 -0700
Committer: Vijay <vi...@gmail.com>
Committed: Sun Mar 9 14:00:17 2014 -0700
----------------------------------------------------------------------
.../org/apache/cassandra/tools/NodeCmd.java | 71 +++++++++++---------
1 file changed, 39 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d2c3fe6/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
[4/4] git commit: nodetool no longer shows node joining patch by
driftx; reviewed by Vijay for CASSANDRA-6811
Posted by vi...@apache.org.
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bc4f5dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bc4f5dc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bc4f5dc
Branch: refs/heads/cassandra-2.1
Commit: 7bc4f5dc327073e431e4f8aa682db76fa3367425
Parents: eb6a7b4
Author: Vijay <vi...@gmail.com>
Authored: Sun Mar 9 14:48:11 2014 -0700
Committer: Vijay <vi...@gmail.com>
Committed: Sun Mar 9 19:15:57 2014 -0700
----------------------------------------------------------------------
.../org/apache/cassandra/tools/NodeTool.java | 70 +++++++++++---------
1 file changed, 39 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bc4f5dc/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 d24e013..5120739 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -506,41 +506,49 @@ public class NodeTool
else
System.out.println();
- for (Map.Entry<InetAddress, Float> entry : filteredOwnerships.entrySet())
+ for (Map.Entry<String, String> entry : endpointsToTokens.entries())
{
- String endpoint = entry.getKey().getHostAddress();
- for (String token : endpointsToTokens.get(endpoint))
+ String endpoint = entry.getKey();
+ String rack;
+ try
{
- String rack;
- try
- {
- rack = probe.getEndpointSnitchInfoProxy().getRack(endpoint);
- } catch (UnknownHostException e)
- {
- rack = "Unknown";
- }
+ rack = probe.getEndpointSnitchInfoProxy().getRack(endpoint);
+ }
+ catch (UnknownHostException e)
+ {
+ rack = "Unknown";
+ }
- String status = liveNodes.contains(endpoint)
- ? "Up"
- : deadNodes.contains(endpoint)
- ? "Down"
- : "?";
-
- String state = "Normal";
-
- if (joiningNodes.contains(endpoint))
- state = "Joining";
- else if (leavingNodes.contains(endpoint))
- state = "Leaving";
- else if (movingNodes.contains(endpoint))
- state = "Moving";
-
- String load = loadMap.containsKey(endpoint)
- ? loadMap.get(endpoint)
- : "?";
- String owns = new DecimalFormat("##0.00%").format(entry.getValue());
- System.out.printf(format, endpoint, rack, status, state, load, owns, token);
+ String status = liveNodes.contains(endpoint)
+ ? "Up"
+ : deadNodes.contains(endpoint)
+ ? "Down"
+ : "?";
+
+ String state = "Normal";
+
+ if (joiningNodes.contains(endpoint))
+ state = "Joining";
+ else if (leavingNodes.contains(endpoint))
+ state = "Leaving";
+ else if (movingNodes.contains(endpoint))
+ state = "Moving";
+
+ String load = loadMap.containsKey(endpoint)
+ ? loadMap.get(endpoint)
+ : "?";
+ String owns;
+ try
+ {
+ InetAddress ep = InetAddress.getByName(endpoint);
+ Float percent = filteredOwnerships.get(ep);
+ owns = (percent != null) ? new DecimalFormat("##0.00%").format(percent) : "?";
+ }
+ catch (UnknownHostException e)
+ {
+ throw new RuntimeException(e);
}
+ System.out.printf(format, endpoint, rack, status, state, load, owns, entry.getValue());
}
System.out.println();
}