You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/11/21 21:17:28 UTC

[5/6] git commit: remove RF from nodetool ring output patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6289

remove RF from nodetool ring output
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6289


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d8ea042
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d8ea042
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d8ea042

Branch: refs/heads/cassandra-2.0
Commit: 0d8ea04223933058a50dbe105a5204abbf127014
Parents: c11bbec
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Nov 21 14:16:37 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Nov 21 14:16:37 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                      | 4 ++++
 src/java/org/apache/cassandra/tools/NodeCmd.java | 5 -----
 2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d8ea042/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 205b9f7..8cc61ad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.0.4
+ * remove RF from nodetool ring output (CASSANDRA-6289)
+
+
 2.0.3
  * Fix FD leak on slice read path (CASSANDRA-6275)
  * Cancel read meter task when closing SSTR (CASSANDRA-6358)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d8ea042/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 034ff29..022f9c0 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -305,20 +305,15 @@ public class NodeCmd
 
         // get the total amount of replicas for this dc and the last token in this dc's ring
         List<String> tokens = new ArrayList<String>();
-        float totalReplicas = 0f;
         String lastToken = "";
 
         for (Map.Entry<InetAddress, Float> entry : filteredOwnerships.entrySet())
         {
             tokens.addAll(endpointsToTokens.get(entry.getKey().getHostAddress()));
             lastToken = tokens.get(tokens.size() - 1);
-            totalReplicas += entry.getValue();
         }
 
 
-        if (keyspaceSelected)
-            outs.print("Replicas: " + (int) totalReplicas + "\n\n");
-
         outs.printf(format, "Address", "Rack", "Status", "State", "Load", "Owns", "Token");
 
         if (filteredOwnerships.size() > 1)