Author: eevans
Date: Fri Apr 2 21:41:19 2010
New Revision: 930397
URL: http://svn.apache.org/viewvc?rev=930397&view=rev
Log:
correct inversion of cmd arguments in clustertool
Patch by Sylvain Lebresne; reviewed by eevans for CASSANDRA-942
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/ClusterCmd.java
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/ClusterCmd.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/ClusterCmd.java?rev=930397&r1=930396&r2=930397&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/ClusterCmd.java
(original)
+++
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/ClusterCmd.java
Fri Apr 2 21:41:19 2010
@@ -50,7 +50,7 @@ public class ClusterCmd {
Option optHost = new Option(HOST_OPT_SHORT, HOST_OPT_LONG, true, "node
hostname or ip address");
optHost.setRequired(true);
options.addOption(optHost);
- options.addOption(PORT_OPT_SHORT, PORT_OPT_LONG, true, "remote jmx
agent port number");
+ options.addOption(PORT_OPT_SHORT, PORT_OPT_LONG, true, "remote jmx
agent port number (defaults to " + defaultPort + ")");
}
/**
@@ -139,14 +139,14 @@ public class ClusterCmd {
{
HelpFormatter hf = new HelpFormatter();
String header = String.format(
- "%nAvailable commands: get_endpoints [key], global_snapshot
[name], clear_global_snapshot");
+ "%nAvailable commands: get_endpoints [keyspace] [key],
global_snapshot [name], clear_global_snapshot");
String usage = String.format("java %s -host <arg> <command>%n",
ClusterCmd.class.getName());
hf.printHelp(usage, "", options, header);
}
- public void printEndPoints(String key, String table)
+ public void printEndPoints(String keyspace, String key)
{
- List<InetAddress> endpoints = probe.getEndPoints(key, table);
+ List<InetAddress> endpoints = probe.getEndPoints(keyspace, key);
System.out.println(String.format("%-17s: %s", "Key", key));
System.out.println(String.format("%-17s: %s", "Endpoints", endpoints));
}
@@ -256,7 +256,9 @@ public class ClusterCmd {
{
if (arguments.length <= 2)
{
- System.err.println("missing key and/or table argument");
+ System.err.println("missing keyspace and/or key argument");
+ ClusterCmd.printUsage();
+ System.exit(1);
}
clusterCmd.printEndPoints(arguments[1], arguments[2]);
}
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java?rev=930397&r1=930396&r2=930397&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java
(original)
+++
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java
Fri Apr 2 21:41:19 2010
@@ -400,9 +400,9 @@ public class NodeProbe
}
}
- public List<InetAddress> getEndPoints(String key, String table)
+ public List<InetAddress> getEndPoints(String keyspace, String key)
{
- return ssProxy.getNaturalEndpoints(key, table);
+ return ssProxy.getNaturalEndpoints(keyspace, key);
}
public Set<InetAddress> getStreamDestinations()
