You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/02/10 16:40:47 UTC
[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 <br...@apache.org>
Authored: Mon Feb 10 09:36:42 2014 -0600
Committer: Brandon Williams <br...@apache.org>
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)