Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 36C4E18C71 for ; Thu, 14 Jan 2016 14:50:25 +0000 (UTC) Received: (qmail 49306 invoked by uid 500); 14 Jan 2016 14:50:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49269 invoked by uid 500); 14 Jan 2016 14:50:24 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 49249 invoked by uid 99); 14 Jan 2016 14:50:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Jan 2016 14:50:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A5FF0E3834; Thu, 14 Jan 2016 14:50:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Thu, 14 Jan 2016 14:50:24 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cassandra git commit: Connect to next node if stream session with previous node is complete Repository: cassandra Updated Branches: refs/heads/trunk 512a2fa21 -> efc7d1b9a 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/trunk Commit: e1938e2e790f9a623cec97aa697c2a85c89f6f53 Parents: 1020779 Author: Paulo Motta Authored: Thu Jan 14 07:01:10 2016 -0300 Committer: T Jake Luciani 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)