retry failed stream on IOException patch by yukim; reviewed by jbellis for CASSANDRA-3686
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7efab48e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7efab48e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7efab48e Branch: refs/heads/cassandra-1.0 Commit: 7efab48e72247734ae38eabfc61a9ff0a5aa87ec Parents: 02346a1 Author: Jonathan Ellis <[email protected]> Authored: Fri Dec 30 23:04:43 2011 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Dec 30 23:04:43 2011 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/streaming/IncomingStreamReader.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7efab48e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index bd35149..76d4981 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.0.7 + * retry failed stream on IOException (CASSANDRA-3686) * allow configuring bloom_filter_fp_chance (CASSANDRA-3497) * attempt hint delivery every ten minutes, or when failure detector notifies us that a node is back up, whichever comes first. hint http://git-wip-us.apache.org/repos/asf/cassandra/blob/7efab48e/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 8c89873..f70f5ff 100644 --- a/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java +++ b/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java @@ -158,7 +158,10 @@ public class IncomingStreamReader catch (Exception e) { writer.abort(); - throw FBUtilities.unchecked(e); + if (e instanceof IOException) + throw (IOException) e; + else + throw FBUtilities.unchecked(e); } }
