You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/04/11 05:10:12 UTC
svn commit: r1090926 - in /cassandra/branches/cassandra-0.7: CHANGES.txt
src/java/org/apache/cassandra/service/StorageService.java
Author: jbellis
Date: Mon Apr 11 03:10:12 2011
New Revision: 1090926
URL: http://svn.apache.org/viewvc?rev=1090926&view=rev
Log:
re-set bootstrapped flag after move finishes
patch by jbellis; reviewed by Peter Schuller and Nick Bailey for CASSANDRA-2435
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=1090926&r1=1090925&r2=1090926&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Mon Apr 11 03:10:12 2011
@@ -26,6 +26,7 @@
* halve default memtable thresholds (CASSANDRA-2413)
* convert mmap assertion to if/throw so scrub can catch it (CASSANDRA-2417)
* Try harder to close files after compaction (CASSANDRA-2431)
+ * re-set bootstrapped flag after move finishes (CASSANDRA-2435)
0.7.4
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=1090926&r1=1090925&r2=1090926&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 Mon Apr 11 03:10:12 2011
@@ -203,6 +203,7 @@ public class StorageService implements I
public void finishBootstrapping()
{
isBootstrapMode = false;
+ SystemTable.setBootstrapped(true);
setToken(getLocalToken());
logger_.info("Bootstrap/move completed! Now serving reads.");
}
@@ -477,10 +478,9 @@ public class StorageService implements I
{
logger_.info("Using saved token " + token);
}
- }
-
- SystemTable.setBootstrapped(true); // first startup is only chance to bootstrap
- setToken(token);
+ SystemTable.setBootstrapped(true); // first startup is only chance to bootstrap
+ setToken(token);
+ }
assert tokenMetadata_.sortedTokens().size() > 0;
}