Updated Branches: refs/heads/cassandra-1.0 b2ca7f821 -> 452619cd0 refs/heads/cassandra-1.1 fd66ccf21 -> 861f1f3a9 refs/heads/trunk e6cebc89c -> ca104bac3
Merge branch 'cassandra-1.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/ca104bac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca104bac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca104bac Branch: refs/heads/trunk Commit: ca104bac3b21a13c6d30b814288f952f8c8d511c Parents: e6cebc8 861f1f3 Author: Brandon Williams <[email protected]> Authored: Wed May 9 11:37:32 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed May 9 11:37:32 2012 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeCmd.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca104bac/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java index 6a4632b,451bfea..c7befea --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@@ -140,12 -142,10 +140,12 @@@ public class NodeCm addCmdHelp(header, "join", "Join the ring"); addCmdHelp(header, "info", "Print node informations (uptime, load, ...)"); addCmdHelp(header, "cfstats", "Print statistics on column families"); + addCmdHelp(header, "ids", "Print list of unique host IDs"); addCmdHelp(header, "version", "Print cassandra version"); addCmdHelp(header, "tpstats", "Print usage statistics of thread pools"); + addCmdHelp(header, "proxyhistograms", "Print statistic histograms for network operations"); addCmdHelp(header, "drain", "Drain the node (stop accepting writes and flush all column families)"); - addCmdHelp(header, "decommission", "Decommission the node"); + addCmdHelp(header, "decommission", "Decommission the *node I am connecting to*"); addCmdHelp(header, "compactionstats", "Print statistics on compactions"); addCmdHelp(header, "disablegossip", "Disable gossip (effectively marking the node dead)"); addCmdHelp(header, "enablegossip", "Reenable gossip"); @@@ -753,8 -716,16 +752,17 @@@ case ENABLETHRIFT : probe.startThriftServer(); break; case STATUSTHRIFT : nodeCmd.printIsThriftServerRunning(System.out); break; case RESETLOCALSCHEMA: probe.resetLocalSchema(); break; + case IDS : nodeCmd.printHostIds(System.out); break; + case DECOMMISSION : + if (arguments.length > 0) + { + System.err.println("Decommission will decommission the node you are connected to and does not take arguments!"); + System.exit(1); + } + probe.decommission(); + break; + case DRAIN : try { probe.drain(); } catch (ExecutionException ee) { err(ee, "Error occured during flushing"); }
