natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nodetool no longer shows node joining 

patch by driftx; reviewed by Vijay for CASSANDRA-6811
This commit is contained in:
Vijay 2014-03-09 14:48:11 -07:00
parent eb6a7b4285
commit 7bc4f5dc32
1 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/java/org/apache/cassandra/tools/NodeTool.java
View File

@ -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";
}
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);
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;
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();
}