Fix repair hanging silently on an unexpected error

patch by yukim; reviewed by slebresne for CASSANDRA-5229
apache · May 6, 2013 · 45e6d91 · 45e6d91
1 parent 0637b86
commit 45e6d91
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git 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

diff --git a/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java b/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
@@ -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();