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 0D27BC35D for ; Wed, 19 Jun 2013 21:31:20 +0000 (UTC) Received: (qmail 36571 invoked by uid 500); 19 Jun 2013 21:31:18 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 36542 invoked by uid 500); 19 Jun 2013 21:31:18 -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 36491 invoked by uid 99); 19 Jun 2013 21:31:18 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Jun 2013 21:31:18 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DD89725E2F; Wed, 19 Jun 2013 21:31:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Wed, 19 Jun 2013 21:31:18 -0000 Message-Id: In-Reply-To: <35b2320b7b104ee2b4ac2a365d2d7e9c@git.apache.org> References: <35b2320b7b104ee2b4ac2a365d2d7e9c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: simplify initClient gossip loop patch by Adrian Nistor and jbellis for CASSANDRA-5662 simplify initClient gossip loop patch by Adrian Nistor and jbellis for CASSANDRA-5662 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ba0ff03 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ba0ff03 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ba0ff03 Branch: refs/heads/trunk Commit: 9ba0ff03e211554df6b01fd860159cc74bf95026 Parents: fc5044f Author: Jonathan Ellis Authored: Wed Jun 19 16:30:02 2013 -0500 Committer: Jonathan Ellis Committed: Wed Jun 19 16:30:08 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ba0ff03/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index e73aa2e..34ecec8 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -395,16 +395,14 @@ public class StorageService extends NotificationBroadcasterSupport implements IE try { // sleep a while to allow gossip to warm up (the other nodes need to know about this one before they can reply). - boolean isUp = false; - while (!isUp) + outer: + while (true) { Thread.sleep(1000); for (InetAddress address : Gossiper.instance.getLiveMembers()) { if (!Gossiper.instance.isFatClient(address)) - { - isUp = true; - } + break outer; } }