cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/3] git commit: Merge from 1.1
Date Tue, 22 May 2012 16:29:02 GMT
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 <brandonwilliams@apache.org>
Authored: Tue May 22 11:28:54 2012 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
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)
          {


Mime
View raw message