Show progress of streaming in nodetool netstats

patch by Phil Yang; reviewed by yukim for CASSANDRA-8886


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

Branch: refs/heads/trunk
Commit: d201a2518a9dfd0aa4fca43c919a7a99cfb46412
Parents: f6d82a5
Author: Phil Yang <ud1...@gmail.com>
Authored: Tue Mar 3 14:30:11 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 3 15:02:59 2015 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/NodeTool.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d201a251/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 a639b45..9094fbd 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -626,9 +626,9 @@ public class NodeTool
                     if (!info.receivingSummaries.isEmpty())
                     {
                         if (humanReadable)
-                            System.out.printf("        Receiving %d files, %s 
total%n", info.getTotalFilesToReceive(), 
FileUtils.stringifyFileSize(info.getTotalSizeToReceive()));
+                            System.out.printf("        Receiving %d files, %s 
total. Already received %d files, %s total%n", info.getTotalFilesToReceive(), 
FileUtils.stringifyFileSize(info.getTotalSizeToReceive()), 
info.getTotalFilesReceived(), 
FileUtils.stringifyFileSize(info.getTotalSizeReceived()));
                         else
-                            System.out.printf("        Receiving %d files, %d 
bytes total%n", info.getTotalFilesToReceive(), info.getTotalSizeToReceive());
+                            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());
@@ -637,9 +637,9 @@ public class NodeTool
                     if (!info.sendingSummaries.isEmpty())
                     {
                         if (humanReadable)
-                            System.out.printf("        Sending %d files, %s 
total%n", info.getTotalFilesToSend(), 
FileUtils.stringifyFileSize(info.getTotalSizeToSend()));
+                            System.out.printf("        Sending %d files, %s 
total. Already sent %d files, %s total%n", info.getTotalFilesToSend(), 
FileUtils.stringifyFileSize(info.getTotalSizeToSend()), 
info.getTotalFilesSent(), FileUtils.stringifyFileSize(info.getTotalSizeSent()));
                         else
-                            System.out.printf("        Sending %d files, %d 
bytes total%n", info.getTotalFilesToSend(), info.getTotalSizeToSend());
+                            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());

Reply via email to