You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2015/06/11 09:26:23 UTC
[1/2] cassandra git commit: Make nodetool exit with non-0 status if
there is a failure
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 081a37224 -> 6dfde0e32
Make nodetool exit with non-0 status if there is a failure
Patch by marcuse; reviewed by Aleksey Yeschenko for CASSANDRA-9569
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7d02e39
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7d02e39
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7d02e39
Branch: refs/heads/cassandra-2.2
Commit: e7d02e39cb13f272ddc3d09b9a570c4d6948c37e
Parents: 212a2c1
Author: Marcus Eriksson <ma...@apache.org>
Authored: Tue Jun 9 10:18:25 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 11 09:24:08 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeTool.java | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7d02e39/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 928eb55..5c31509 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.6
+ * Make nodetool exit with non-0 status on failure (CASSANDRA-9569)
* (cqlsh) Fix using COPY through SOURCE or -f (CASSANDRA-9083)
* Fix occasional lack of `system` keyspace in schema tables (CASSANDRA-8487)
* Use ProtocolError code instead of ServerError code for native protocol
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7d02e39/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 86b5f52..a2d4ead 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -286,7 +286,9 @@ public class NodeTool
try (NodeProbe probe = connect())
{
execute(probe);
- }
+ if (probe.isFailed())
+ throw new RuntimeException("nodetool failed, check server logs");
+ }
catch (IOException e)
{
throw new RuntimeException("Error while closing JMX connection", e);
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/tools/NodeTool.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6dfde0e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6dfde0e3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6dfde0e3
Branch: refs/heads/cassandra-2.2
Commit: 6dfde0e32e9b2c7a7b36e26997001a28316664a2
Parents: 081a372 e7d02e3
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jun 11 09:25:32 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jun 11 09:25:32 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tools/NodeTool.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6dfde0e3/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1b75756,5c31509..355eefb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,5 +1,31 @@@
-2.1.6
+2.2
+ * Make sure we cancel non-compacting sstables from LifecycleTransaction (CASSANDRA-9566)
+
+
+2.2.0-rc1
+ * Compressed commit log should measure compressed space used (CASSANDRA-9095)
+ * Fix comparison bug in CassandraRoleManager#collectRoles (CASSANDRA-9551)
+ * Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400)
+ * Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546)
+ * Empty INITCOND treated as null in aggregate (CASSANDRA-9457)
+ * Remove use of Cell in Thrift MapReduce classes (CASSANDRA-8609)
+ * Integrate pre-release Java Driver 2.2-rc1, custom build (CASSANDRA-9493)
+ * Clean up gossiper logic for old versions (CASSANDRA-9370)
+ * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515)
+ * ant test-all results incomplete when parsed (CASSANDRA-9463)
+ * Disallow frozen<> types in function arguments and return types for
+ clarity (CASSANDRA-9411)
+ * Static Analysis to warn on unsafe use of Autocloseable instances (CASSANDRA-9431)
+ * Update commitlog archiving examples now that commitlog segments are
+ not recycled (CASSANDRA-9350)
+ * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568)
+ * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399)
+ * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409)
+ * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429)
+ * Add ability to stop compaction by ID (CASSANDRA-7207)
+ * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438)
+Merged from 2.1:
+ * Make nodetool exit with non-0 status on failure (CASSANDRA-9569)
* (cqlsh) Fix using COPY through SOURCE or -f (CASSANDRA-9083)
* Fix occasional lack of `system` keyspace in schema tables (CASSANDRA-8487)
* Use ProtocolError code instead of ServerError code for native protocol
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6dfde0e3/src/java/org/apache/cassandra/tools/NodeTool.java
----------------------------------------------------------------------