Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/tools/NodeCmd.java
src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e5dd390b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e5dd390b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e5dd390b
Branch: refs/heads/trunk
Commit: e5dd390b96fb2ff6126b6d60de235fe0fb18af51
Parents: bef5209 843dc79
Author: Brandon Williams <[email protected]>
Authored: Tue May 28 13:54:13 2013 -0500
Committer: Brandon Williams <[email protected]>
Committed: Tue May 28 13:54:13 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeCmd.java | 40 ++++++++++++++-
src/java/org/apache/cassandra/tools/NodeProbe.java | 18 ++-----
.../org/apache/cassandra/tools/NodeToolHelp.yaml | 6 ++
3 files changed, 50 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5dd390b/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java
index 2e050a8,bca0fcd..2af02ea
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@@ -115,8 -118,8 +115,10 @@@ public class NodeCm
ENABLETHRIFT,
FLUSH,
GETCOMPACTIONTHRESHOLD,
+ DISABLEAUTOCOMPACTION,
+ ENABLEAUTOCOMPACTION,
+ GETCOMPACTIONTHROUGHPUT,
+ GETSTREAMTHROUGHPUT,
GETENDPOINTS,
GETSSTABLES,
GOSSIPINFO,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5dd390b/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e5dd390b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
----------------------------------------------------------------------
diff --cc src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
index c66c501,568aa20..6ec6d2e
--- a/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
+++ b/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml
@@@ -161,12 -161,12 +161,18 @@@ commands
- name: getcompactionthreshold <keyspace> <cfname>
help: |
Print min and max compaction thresholds for a given column family
+ - name: disableautocompaction [keyspace] [cfnames]
+ help: |
+ Disable autocompaction for the given keyspace and column family
+ - name: enableautocompaction [keyspace] [cfnames]
+ help: |
+ Enable autocompaction
+ - name: getcompactionthroughput
+ help: |
+ 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
- name: stop <compaction_type>
help: |
Supported types are COMPACTION, VALIDATION, CLEANUP, SCRUB, INDEX_BUILD
