You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/03/03 22:04:47 UTC
[1/3] cassandra git commit: Show progress of streaming in nodetool
netstats
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 f6d82a55f -> d201a2518
refs/heads/trunk b53313533 -> 695172631
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/cassandra-2.1
Commit: d201a2518a9dfd0aa4fca43c919a7a99cfb46412
Parents: f6d82a5
Author: Phil Yang <ud...@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());
[2/3] cassandra git commit: Show progress of streaming in nodetool
netstats
Posted by yu...@apache.org.
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 <ud...@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());
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69517263
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69517263
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69517263
Branch: refs/heads/trunk
Commit: 695172631d80eb093ef56b71bfa9d444cb12a3c1
Parents: b533135 d201a25
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Mar 3 15:03:16 2015 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Mar 3 15:03:16 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/69517263/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------