From 1751579be28f0c0460fb01fdd797b7f7e5cc431f Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandonwilliams@apache.org>
Date: Thu, 9 Dec 2010 16:57:42 +0000
Subject: [PATCH] Restore finishBootstrapping behavior to fix nodetool move. 
 Patch by Nick Bailey, reviewed by brandonwilliams for CASSANDRA-1829

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1044034 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/cassandra/service/StorageService.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 589ffe7e36..7a6880e486 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -246,6 +246,7 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
     public void finishBootstrapping()
     {
         isBootstrapMode = false;
+        setToken(getLocalToken());
         logger_.info("Bootstrap/move completed! Now serving reads.");
     }
 
@@ -256,6 +257,8 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
             logger_.debug("Setting token to {}", token);
         SystemTable.updateToken(token);
         tokenMetadata_.updateNormalToken(token, FBUtilities.getLocalAddress());
+        Gossiper.instance.addLocalApplicationState(ApplicationState.STATUS, valueFactory.normal(getLocalToken()));
+        setMode("Normal", false);
     }
 
     public StorageService()
@@ -395,6 +398,7 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
             logger_.info("This node will not auto bootstrap because it is configured to be a seed node.");
 
         Token token;
+        boolean bootstrapped = false;
         if (DatabaseDescriptor.isAutoBootstrap()
             && !(DatabaseDescriptor.getSeeds().contains(FBUtilities.getLocalAddress()) || SystemTable.isBootstrapped()))
         {
@@ -414,6 +418,8 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
             {
                 bootstrap(token);
                 assert !isBootstrapMode; // bootstrap will block until finished
+                bootstrapped = true;
+                SystemTable.setBootstrapped(true); // first startup is only chance to bootstrap
             }
             // else nothing to do, go directly to participating in ring
         }
@@ -440,10 +446,8 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
             }
         } 
 
-        SystemTable.setBootstrapped(true); // first startup is only chance to bootstrap
-        setToken(token);
-        Gossiper.instance.addLocalApplicationState(ApplicationState.STATUS, valueFactory.normal(getLocalToken()));
-        setMode("Normal", false);
+        if(!bootstrapped)
+            setToken(token);
 
         assert tokenMetadata_.sortedTokens().size() > 0;
     }