Repository: cassandra Updated Branches: refs/heads/cassandra-3.2.1 [created] 159049db7
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/159049db Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/159049db Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/159049db Branch: refs/heads/cassandra-3.2.1 Commit: 159049db75dd78de8d84ec0cc31dcdf5c1404ea9 Parents: 3c6dfa4 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:43:43 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ src/java/org/apache/cassandra/streaming/StreamCoordinator.java | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/159049db/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 339ac4a..8659e24 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,6 @@ +3.2.1 + Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010) + 3.2 * Make sure tokens don't exist in several data directories (CASSANDRA-6696) * Add requireAuthorization method to IAuthorizer (CASSANDRA-10852) http://git-wip-us.apache.org/repos/asf/cassandra/blob/159049db/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)
