Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 b93ca58d4 -> 9783777c2 refs/heads/cassandra-2.1 2279d49e9 -> 88c71963c refs/heads/trunk 9f4284aef -> 349669ed9
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/9783777c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9783777c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9783777c Branch: refs/heads/cassandra-2.0 Commit: 9783777c2a257599a65bd0f058537b98d1512025 Parents: b93ca58 Author: Olve Sæther Hansen <[email protected]> Authored: Thu Oct 2 13:06:23 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Thu Oct 2 13:07:39 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeCmd.java | 2 +- src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9783777c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f3d5998..9914ad9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -33,6 +33,7 @@ * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/9783777c/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 4d9992f..27b50a7 100644 --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@ -811,7 +811,7 @@ public class NodeCmd */ public void printStreamThroughput(PrintStream outs) { - outs.println("Current stream throughput: " + probe.getStreamThroughput() + " MB/s"); + outs.println("Current stream throughput: " + probe.getStreamThroughput() + " Mb/s"); } /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/9783777c/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml ---------------------------------------------------------------------- diff --git a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml index 416ef1a..fa2b39c 100644 --- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml +++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml @@ -123,7 +123,7 @@ commands: Set the MB/s throughput cap for compaction in the system, or 0 to disable throttling. - name: setstreamthroughput <value_in_mb> help: | - Set the MB/s throughput cap for streaming in the system, or 0 to disable throttling. + Set the Mb/s throughput cap for streaming in the system, or 0 to disable throttling. - name: describecluster help: | Print the name, snitch, partitioner and schema version of a cluster. @@ -189,7 +189,7 @@ commands: Print the MB/s throughput cap for compaction in the system - name: getstreamthroughput help: | - Print the MB/s throughput cap for streaming in the system + Print the Mb/s throughput cap for streaming in the system - name: stop <compaction_type> help: | Supported types are COMPACTION, VALIDATION, CLEANUP, SCRUB, INDEX_BUILD
