Fix unit for streaming throughput in nodetool patch by Olve Sæther Hansen; reviewed by yukim for CASSANDRA-7375
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dd4da3e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd4da3e8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd4da3e8 Branch: refs/heads/cassandra-2.1 Commit: dd4da3e83fb11516569c13df13d41f1a8c6609a7 Parents: 2279d49 Author: Olve Sæther Hansen <[email protected]> Authored: Thu Oct 2 13:11:44 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Oct 2 13:13:47 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeTool.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd4da3e8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ac83b12..beab957 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -100,6 +100,7 @@ Merged from 2.0: * Fix NPE when table dropped during streaming (CASSANDRA-7946) * Fix wrong progress when streaming uncompressed (CASSANDRA-7878) * Fix possible infinite loop in creating repair range (CASSANDRA-7983) + * Fix unit in nodetool for streaming throughput (CASSANDRA-7375) Merged from 1.2: * Don't index tombstones (CASSANDRA-7828) * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788) http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd4da3e8/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 1d7b1ad..55cd869 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -1393,13 +1393,13 @@ public class NodeTool } } - @Command(name = "getstreamthroughput", description = "Print the MB/s throughput cap for streaming in the system") + @Command(name = "getstreamthroughput", description = "Print the Mb/s throughput cap for streaming in the system") public static class GetStreamThroughput extends NodeToolCmd { @Override public void execute(NodeProbe probe) { - System.out.println("Current stream throughput: " + probe.getStreamThroughput() + " MB/s"); + System.out.println("Current stream throughput: " + probe.getStreamThroughput() + " Mb/s"); } } @@ -1765,10 +1765,10 @@ public class NodeTool } } - @Command(name = "setstreamthroughput", description = "Set the MB/s throughput cap for streaming in the system, or 0 to disable throttling") + @Command(name = "setstreamthroughput", description = "Set the Mb/s throughput cap for streaming in the system, or 0 to disable throttling") public static class SetStreamThroughput extends NodeToolCmd { - @Arguments(title = "stream_throughput", usage = "<value_in_mb>", description = "Value in MB, 0 to disable throttling", required = true) + @Arguments(title = "stream_throughput", usage = "<value_in_mb>", description = "Value in Mb, 0 to disable throttling", required = true) private Integer streamThroughput = null; @Override
