You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/05/06 09:08:31 UTC
git commit: Fix repair hanging silently on an unexpected error
Updated Branches:
refs/heads/cassandra-1.2 0637b8674 -> 45e6d912c
Fix repair hanging silently on an unexpected error
patch by yukim; reviewed by slebresne for CASSANDRA-5229
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/45e6d912
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45e6d912
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45e6d912
Branch: refs/heads/cassandra-1.2
Commit: 45e6d912cca3de66a3af02e9df2c3484992d0a2e
Parents: 0637b86
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon May 6 09:07:31 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon May 6 09:07:31 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/streaming/IncomingStreamReader.java | 6 ++++++
2 files changed, 7 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/45e6d912/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4376a25..4bdfb91 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -20,6 +20,7 @@
(CASSANDRA-5531)
* cqlsh: add CLUSTERING ORDER BY support to DESCRIBE (CASSANDRA-5528)
* Add custom secondary index support to CQL3 (CASSANDRA-5484)
+ * Fix repair hanging silently on unexpected error (CASSANDRA-5229)
Merged from 1.1
* Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
* Use allocator information to improve memtable memory usage estimate
http://git-wip-us.apache.org/repos/asf/cassandra/blob/45e6d912/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java b/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
index 8036afd..0b058fc 100644
--- a/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
+++ b/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
@@ -127,6 +127,12 @@ public class IncomingStreamReader
retry();
throw ex;
}
+ catch (RuntimeException e)
+ {
+ // if we encountered unexpected exception, fail this session
+ session.close(false);
+ throw e;
+ }
}
session.closeIfFinished();