You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/01/14 01:41:22 UTC

git commit: Bootstrapping nodes never use the hibernation state. Patch by brandonwilliams, reviewed by vijay for CASSANDRA-3737

Updated Branches:
  refs/heads/trunk cfd9399dc -> 9ad560d2f


Bootstrapping nodes never use the hibernation state.
Patch by brandonwilliams, reviewed by vijay for CASSANDRA-3737


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ad560d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ad560d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ad560d2

Branch: refs/heads/trunk
Commit: 9ad560d2fbb7f4a9a2cbac5741fe9301919b6319
Parents: cfd9399
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 13 18:33:16 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 13 18:33:16 2012 -0600

----------------------------------------------------------------------
 .../apache/cassandra/service/StorageService.java   |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ad560d2/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 db95259..4b544bc 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -507,7 +507,8 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
         Gossiper.instance.start(SystemTable.incrementAndGetGeneration()); // needed for node-ring gathering.
         // add rpc listening info
         Gossiper.instance.addLocalApplicationState(ApplicationState.RPC_ADDRESS, valueFactory.rpcaddress(DatabaseDescriptor.getRpcAddress()));
-        Gossiper.instance.addLocalApplicationState(ApplicationState.STATUS, valueFactory.hibernate(null != DatabaseDescriptor.getReplaceToken()));
+        if (null != DatabaseDescriptor.getReplaceToken())
+            Gossiper.instance.addLocalApplicationState(ApplicationState.STATUS, valueFactory.hibernate(true));
 
         MessagingService.instance().listen(FBUtilities.getLocalAddress());
         LoadBroadcaster.instance.startBroadcasting();