Merge from 1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/861f1f3a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/861f1f3a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/861f1f3a Branch: refs/heads/cassandra-1.1 Commit: 861f1f3a99854af42b2f7c91f2e16bcd1b0c094b Parents: fd66ccf 452619c Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed May 9 11:36:52 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed May 9 11:36:52 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/861f1f3a/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java index e33f698,c369771..451bfea --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@@ -700,14 -647,9 +700,13 @@@ public class NodeCm switch (command) { - case RING : nodeCmd.printRing(System.out); break; + case RING : + if (arguments.length > 0) { nodeCmd.printRing(System.out, arguments[0]); } + else { nodeCmd.printRing(System.out, null); }; + break; + case INFO : nodeCmd.printInfo(System.out); break; case CFSTATS : nodeCmd.printColumnFamilyStats(System.out); break; - case DECOMMISSION : probe.decommission(); break; case TPSTATS : nodeCmd.printThreadPoolStats(System.out); break; case VERSION : nodeCmd.printReleaseVersion(System.out); break; case COMPACTIONSTATS : nodeCmd.printCompactionStats(System.out); break; @@@ -716,8 -658,16 +715,17 @@@ case DISABLETHRIFT : probe.stopThriftServer(); break; case ENABLETHRIFT : probe.startThriftServer(); break; case STATUSTHRIFT : nodeCmd.printIsThriftServerRunning(System.out); break; + case RESETLOCALSCHEMA: probe.resetLocalSchema(); 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"); }
