svn commit: r1101772 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/service/StorageService.java

[sl...@apache.org]

Author: slebresne
Date: Wed May 11 07:19:32 2011
New Revision: 1101772

URL: http://svn.apache.org/viewvc?rev=1101772&view=rev
Log:
Fix regression where boostrapping a node without schema defined fails
patch by slebresne; reviewed by jbellis for CASSANDRA-2625

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

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1101772&r1=1101771&r2=1101772&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed May 11 07:19:32 2011
@@ -15,6 +15,8 @@
  * recognize attempt to drop just the index while leaving the column
    definition alone (CASSANDRA-2619)
  * Don't allow {LOCAL|EACH}_QUORUM unless strategy is NTS (CASSANDRA-2627)
+ * Fix regression where bootstrapping a node with no schema fails
+   (CASSANDRA-2625)
 
 
 0.7.5

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=1101772&r1=1101771&r2=1101772&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 Wed May 11 07:19:32 2011
@@ -453,7 +453,12 @@ public class StorageService implements I
                 bootstrap(token);
                 assert !isBootstrapMode; // bootstrap will block until finished
             }
-            // else nothing to do, go directly to participating in ring
+            else
+            {
+                // nothing to bootstrap, go directly to participating in ring
+                SystemTable.setBootstrapped(true);
+                setToken(token);
+            }
         }
         else
         {