Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1DAF710443 for ; Mon, 10 Feb 2014 15:40:53 +0000 (UTC) Received: (qmail 83287 invoked by uid 500); 10 Feb 2014 15:40:48 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 83071 invoked by uid 500); 10 Feb 2014 15:40:47 -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 83020 invoked by uid 99); 10 Feb 2014 15:40:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Feb 2014 15:40:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id ADC349220EE; Mon, 10 Feb 2014 15:40:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Mon, 10 Feb 2014 15:40:47 -0000 Message-Id: <41279cdeafec4360859f9b9559fa680d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/6] git commit: Partially revert MM.isReadyForBootstrap change from 6648 Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-6685 Partially revert MM.isReadyForBootstrap change from 6648 Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-6685 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5627008 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5627008 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5627008 Branch: refs/heads/cassandra-2.0 Commit: c5627008a2c87ab960da98f4d5b8ca4aca6eebdd Parents: 887558f Author: Brandon Williams Authored: Mon Feb 10 09:36:42 2014 -0600 Committer: Brandon Williams Committed: Mon Feb 10 09:36:42 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/MigrationManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5627008/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java b/src/java/org/apache/cassandra/service/MigrationManager.java index fd9eeda..5a02e3b 100644 --- a/src/java/org/apache/cassandra/service/MigrationManager.java +++ b/src/java/org/apache/cassandra/service/MigrationManager.java @@ -146,7 +146,7 @@ public class MigrationManager public static boolean isReadyForBootstrap() { - return Schema.instance.getVersion() != null && !Schema.emptyVersion.equals(Schema.instance.getVersion()); + return ((ThreadPoolExecutor) StageManager.getStage(Stage.MIGRATION)).getActiveCount() == 0; } public void notifyCreateKeyspace(KSMetaData ksm)