You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2015/02/13 19:11:36 UTC
[1/3] cassandra git commit: Fix exit code in nodetool when keyspace
does not exist.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 746c45853 -> 4223aad66
refs/heads/trunk a4d075800 -> 370e72d0f
Fix exit code in nodetool when keyspace does not exist.
Patch by Sachin Janani, reviewed by brandonwilliams for CASSANDRA-8776
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4223aad6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4223aad6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4223aad6
Branch: refs/heads/cassandra-2.1
Commit: 4223aad66832b217a6be4ecca31b31bab804720a
Parents: 746c458
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 13 12:09:50 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 13 12:09:50 2015 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4223aad6/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index e5d8611..a639b45 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -2066,7 +2066,7 @@ public class NodeTool
StringBuffer errors = new StringBuffer();
- Map<InetAddress, Float> ownerships;
+ Map<InetAddress, Float> ownerships = null;
try
{
ownerships = probe.effectiveOwnership(keyspace);
@@ -2079,7 +2079,7 @@ public class NodeTool
catch (IllegalArgumentException ex)
{
System.out.printf("%nError: " + ex.getMessage() + "%n");
- return;
+ System.exit(1);
}
Map<String, SetHostStat> dcs = getOwnershipByDc(probe, resolveIp, tokensToEndpoints, ownerships);
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.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/370e72d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/370e72d0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/370e72d0
Branch: refs/heads/trunk
Commit: 370e72d0f2357face9c05f5c970baf650fb79a1f
Parents: a4d0758 4223aad
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 13 12:11:28 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 13 12:11:28 2015 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/370e72d0/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
[2/3] cassandra git commit: Fix exit code in nodetool when keyspace
does not exist.
Posted by br...@apache.org.
Fix exit code in nodetool when keyspace does not exist.
Patch by Sachin Janani, reviewed by brandonwilliams for CASSANDRA-8776
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4223aad6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4223aad6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4223aad6
Branch: refs/heads/trunk
Commit: 4223aad66832b217a6be4ecca31b31bab804720a
Parents: 746c458
Author: Brandon Williams <br...@apache.org>
Authored: Fri Feb 13 12:09:50 2015 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Feb 13 12:09:50 2015 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4223aad6/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java
index e5d8611..a639b45 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -2066,7 +2066,7 @@ public class NodeTool
StringBuffer errors = new StringBuffer();
- Map<InetAddress, Float> ownerships;
+ Map<InetAddress, Float> ownerships = null;
try
{
ownerships = probe.effectiveOwnership(keyspace);
@@ -2079,7 +2079,7 @@ public class NodeTool
catch (IllegalArgumentException ex)
{
System.out.printf("%nError: " + ex.getMessage() + "%n");
- return;
+ System.exit(1);
}
Map<String, SetHostStat> dcs = getOwnershipByDc(probe, resolveIp, tokensToEndpoints, ownerships);