Permalink
Browse files

Fix repair hanging silently on an unexpected error

patch by yukim; reviewed by slebresne for CASSANDRA-5229
  • Loading branch information...
pcmanus committed May 6, 2013
1 parent 0637b86 commit 45e6d912cca3de66a3af02e9df2c3484992d0a2e
Showing with 7 additions and 0 deletions.
  1. +1 −0 CHANGES.txt
  2. +6 −0 src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
View
@@ -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
@@ -127,6 +127,12 @@ public void read() throws IOException
retry();
throw ex;
}
+ catch (RuntimeException e)
+ {
+ // if we encountered unexpected exception, fail this session
+ session.close(false);
+ throw e;
+ }
}
session.closeIfFinished();

0 comments on commit 45e6d91

Please sign in to comment.