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 3AD17970F for ; Thu, 5 Apr 2012 20:11:58 +0000 (UTC) Received: (qmail 27985 invoked by uid 500); 5 Apr 2012 20:11:56 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 27883 invoked by uid 500); 5 Apr 2012 20:11:56 -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 27716 invoked by uid 99); 5 Apr 2012 20:11:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Apr 2012 20:11:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 98BCBB363; Thu, 5 Apr 2012 20:11:55 +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: [11/17] git commit: Backport CASSANDRA-3600 to 0.8 Message-Id: <20120405201155.98BCBB363@tyr.zones.apache.org> Date: Thu, 5 Apr 2012 20:11:55 +0000 (UTC) Backport CASSANDRA-3600 to 0.8 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a42cf3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a42cf3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a42cf3f Branch: refs/heads/trunk Commit: 1a42cf3f8e3ef33b22c3f7cf32c981eb2eb3de93 Parents: c5e2428 Author: Brandon Williams Authored: Thu Apr 5 14:53:54 2012 -0500 Committer: Brandon Williams Committed: Thu Apr 5 14:53:54 2012 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageService.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a42cf3f/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 808d6de..132628b 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -79,7 +79,7 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe { private static Logger logger_ = LoggerFactory.getLogger(StorageService.class); - public static final int RING_DELAY = 30 * 1000; // delay after which we assume ring has stablized + public static final int RING_DELAY = getRingDelay(); // delay after which we assume ring has stablized /* All verb handler identifiers */ public enum Verb @@ -146,6 +146,17 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe put(Verb.UNUSED_3, Stage.INTERNAL_RESPONSE); }}; + private static int getRingDelay() + { + String newdelay = System.getProperty("cassandra.ring_delay_ms"); + if (newdelay != null) + { + logger_.warn("Overriding RING_DELAY to {}ms", newdelay); + return Integer.parseInt(newdelay); + } + else + return 30 * 1000; + } /** * This pool is used for periodic short (sub-second) tasks.