Improve streaming synchronization and fault tolerance Patch by Paulo Motta; Reviewed by yukim for CASSANDRA-11414
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00e7ecf1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00e7ecf1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00e7ecf1 Branch: refs/heads/cassandra-3.8 Commit: 00e7ecf1394f8704e2f13369f7950e129459ce2c Parents: 43c741e Author: Paulo Motta <pauloricard...@gmail.com> Authored: Wed Jul 6 12:16:16 2016 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Jul 6 12:32:39 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/streaming/ConnectionHandler.java | 8 +++----- .../org/apache/cassandra/streaming/StreamReceiveTask.java | 2 -- 3 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/00e7ecf1/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index bfd8aa2..7d62f97 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.8 + * Improve streaming synchronization and fault tolerance (CASSANDRA-11414) * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973) Merged from 2.1: * Don't write shadowed range tombstone (CASSANDRA-12030) http://git-wip-us.apache.org/repos/asf/cassandra/blob/00e7ecf1/src/java/org/apache/cassandra/streaming/ConnectionHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java index c497a39..364435e 100644 --- a/src/java/org/apache/cassandra/streaming/ConnectionHandler.java +++ b/src/java/org/apache/cassandra/streaming/ConnectionHandler.java @@ -233,6 +233,9 @@ public class ConnectionHandler protected void signalCloseDone() { + if (closeFuture == null) + close(); + closeFuture.get().set(null); // We can now close the socket @@ -294,11 +297,6 @@ public class ConnectionHandler } } } - catch (SocketException e) - { - // socket is closed - close(); - } catch (Throwable t) { JVMStabilityInspector.inspectThrowable(t); http://git-wip-us.apache.org/repos/asf/cassandra/blob/00e7ecf1/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java index 6911ec6..b342edc 100644 --- a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java +++ b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java @@ -18,8 +18,6 @@ package org.apache.cassandra.streaming; import java.io.File; -import java.io.IOError; -import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List;