Updated Branches: refs/heads/cassandra-1.0 6a1ed6205 -> 9f04f3e16
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/9f04f3e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f04f3e1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f04f3e1 Branch: refs/heads/cassandra-1.0 Commit: 9f04f3e16ecb2a52c91afe21309e496dbfde3070 Parents: 6a1ed62 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 13 18:33:16 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 13 18:34:41 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/9f04f3e1/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 33f58a0..abe8877 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -502,7 +502,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();
