Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 36181 invoked from network); 11 Apr 2011 03:10:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Apr 2011 03:10:35 -0000 Received: (qmail 2011 invoked by uid 500); 11 Apr 2011 03:10:35 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 1907 invoked by uid 500); 11 Apr 2011 03:10:34 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 1899 invoked by uid 99); 11 Apr 2011 03:10:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Apr 2011 03:10:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Apr 2011 03:10:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D9DD623889D7; Mon, 11 Apr 2011 03:10:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1090926 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/service/StorageService.java Date: Mon, 11 Apr 2011 03:10:12 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110411031012.D9DD623889D7@eris.apache.org> 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; }