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 1B4F1C38A for ; Tue, 22 May 2012 16:29:03 +0000 (UTC) Received: (qmail 86183 invoked by uid 500); 22 May 2012 16:29:02 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 86032 invoked by uid 500); 22 May 2012 16:29:02 -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 86009 invoked by uid 99); 22 May 2012 16:29:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 May 2012 16:29:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 79CEF17436; Tue, 22 May 2012 16:29:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Merge from 1.1 Message-Id: <20120522162902.79CEF17436@tyr.zones.apache.org> Date: Tue, 22 May 2012 16:29:02 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.1 a1386f96c -> b5f99a336 refs/heads/trunk 92cf527f8 -> 669025cf2 Merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/669025cf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/669025cf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/669025cf Branch: refs/heads/trunk Commit: 669025cf2319d66629c362e7e377ee321489bded Parents: 92cf527 b5f99a3 Author: Brandon Williams Authored: Tue May 22 11:28:54 2012 -0500 Committer: Brandon Williams Committed: Tue May 22 11:28:54 2012 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- .../apache/cassandra/service/StorageService.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/669025cf/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/669025cf/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index dc91747,f7782f9..4f4c996 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -2266,10 -2277,11 +2266,11 @@@ public class StorageService implements calculatePendingRanges(); Gossiper.instance.addLocalApplicationState(ApplicationState.STATUS, valueFactory.left(getLocalToken(),Gossiper.computeExpireTime())); - logger.info("Announcing that I have left the ring for " + RING_DELAY + "ms"); + int delay = Math.max(RING_DELAY, Gossiper.intervalInMillis * 2); - logger_.info("Announcing that I have left the ring for " + delay + "ms"); ++ logger.info("Announcing that I have left the ring for " + delay + "ms"); try { - Thread.sleep(RING_DELAY); + Thread.sleep(delay); } catch (InterruptedException e) {