cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject svn commit: r1177706 - in /cassandra/branches/cassandra-1.0.0: CHANGES.txt src/java/org/apache/cassandra/service/StorageService.java
Date Fri, 30 Sep 2011 15:48:49 GMT
Author: slebresne
Date: Fri Sep 30 15:48:48 2011
New Revision: 1177706

URL: http://svn.apache.org/viewvc?rev=1177706&view=rev
Log:
Fix bootstrap process
patch by slebresne; reviewed by jbellis for CASSANDRA-3285

Modified:
    cassandra/branches/cassandra-1.0.0/CHANGES.txt
    cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/StorageService.java

Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1177706&r1=1177705&r2=1177706&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Fri Sep 30 15:48:48 2011
@@ -10,6 +10,7 @@
    generates, as intended (CASSANDRA-3262)
  * fix counter entry in jdbc TypesMap (CASSANDRA-3268)
  * fix full queue scenario for ParallelCompactionIterator (CASSANDRA-3270)
+ * fix bootstrap process (CASSANDRA-3285)
 
 
 1.0.0-rc1

Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/StorageService.java?rev=1177706&r1=1177705&r2=1177706&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/StorageService.java
Fri Sep 30 15:48:48 2011
@@ -497,7 +497,7 @@ public class StorageService implements I
         if (DatabaseDescriptor.isAutoBootstrap()
             && !(SystemTable.isBootstrapped()
                  || DatabaseDescriptor.getSeeds().contains(FBUtilities.getBroadcastAddress())
-                 || Schema.instance.getNonSystemTables().isEmpty()))
+                 || !Schema.instance.getNonSystemTables().isEmpty()))
         {
             setMode("Joining: waiting for ring and schema information", true);
             try
@@ -565,13 +565,13 @@ public class StorageService implements I
             {
                 logger_.info("Using saved token " + token);
             }
-
-            // start participating in the ring.
-            SystemTable.setBootstrapped(true);
-            setToken(token);
-            logger_.info("Bootstrap/Replace/Move completed! Now serving reads.");
-            assert tokenMetadata_.sortedTokens().size() > 0;
         }
+
+        // start participating in the ring.
+        SystemTable.setBootstrapped(true);
+        setToken(token);
+        logger_.info("Bootstrap/Replace/Move completed! Now serving reads.");
+        assert tokenMetadata_.sortedTokens().size() > 0;
     }
 
     public synchronized void joinRing() throws IOException, org.apache.cassandra.config.ConfigurationException



Mime
View raw message