cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1044161 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
Date Thu, 09 Dec 2010 23:17:17 GMT
Author: jbellis
Date: Thu Dec  9 23:17:16 2010
New Revision: 1044161

URL: http://svn.apache.org/viewvc?rev=1044161&view=rev
Log:
fix regression from CASSANDRA-1829
patch by jbellis

Modified:
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java?rev=1044161&r1=1044160&r2=1044161&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
Thu Dec  9 23:17:16 2010
@@ -398,7 +398,6 @@ public class StorageService implements I
             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()))
         {
@@ -418,8 +417,6 @@ public class StorageService implements I
             {
                 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
         }
@@ -446,8 +443,8 @@ public class StorageService implements I
             }
         } 
 
-        if(!bootstrapped)
-            setToken(token);
+        SystemTable.setBootstrapped(true); // first startup is only chance to bootstrap
+        setToken(token);
 
         assert tokenMetadata_.sortedTokens().size() > 0;
     }
@@ -580,7 +577,7 @@ public class StorageService implements I
      * STATE_NORMAL,token 
      *   ready to serve reads and writes.
      * STATE_NORMAL,token,REMOVE_TOKEN,token
-     *   specialized normal state in which this node acts as a proxy to tell the cluster
about a dead node whose 
+     *   specialized normal state in which this node acts as a proxy to tell the cluster
about a dead node whose
      *   token is being removed. this value becomes the permanent state of this node (unless
it coordinates another
      *   removetoken in the future).
      * STATE_LEAVING,token 



Mime
View raw message