Repository: cassandra Updated Branches: refs/heads/cassandra-3.3 10207793d -> e1938e2e7
Connect to next node if stream session with previous node is complete patch by Paulo Motta; reviewed by tjake for CASSANDRA-11010 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1938e2e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1938e2e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1938e2e Branch: refs/heads/cassandra-3.3 Commit: e1938e2e790f9a623cec97aa697c2a85c89f6f53 Parents: 1020779 Author: Paulo Motta <[email protected]> Authored: Thu Jan 14 07:01:10 2016 -0300 Committer: T Jake Luciani <[email protected]> Committed: Thu Jan 14 09:47:40 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1938e2e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 447b857..bf873fc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.3 + * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010) Merged from 3.0: * Ensure stale index entries are purged during reads (CASSANDRA-11013) * (cqlsh) Also apply --connect-timeout to control connection http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1938e2e/src/java/org/apache/cassandra/streaming/StreamCoordinator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamCoordinator.java b/src/java/org/apache/cassandra/streaming/StreamCoordinator.java index aac1671..2cb75f7 100644 --- a/src/java/org/apache/cassandra/streaming/StreamCoordinator.java +++ b/src/java/org/apache/cassandra/streaming/StreamCoordinator.java @@ -114,10 +114,8 @@ public class StreamCoordinator { public void handleStreamEvent(StreamEvent event) { - if (event.eventType == StreamEvent.Type.STREAM_PREPARED) - { + if (event.eventType == StreamEvent.Type.STREAM_PREPARED || event.eventType == StreamEvent.Type.STREAM_COMPLETE) connectNext(); - } } public void onSuccess(StreamState result)
