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:46 UTC
[1/6] git commit: Partially revert MM.isReadyForBootstrap change from
6648 Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-6685
Updated Branches:
refs/heads/cassandra-1.2 887558f7a -> c5627008a
refs/heads/cassandra-2.0 16f99c5a2 -> b5321d50b
refs/heads/trunk de9be79d5 -> 861d9960d
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-1.2
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)
[6/6] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/861d9960
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/861d9960
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/861d9960
Branch: refs/heads/trunk
Commit: 861d9960d0659a8b77734d448a777c982ff9030b
Parents: de9be79 b5321d5
Author: Brandon Williams <br...@apache.org>
Authored: Mon Feb 10 09:37:56 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Feb 10 09:37:56 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/861d9960/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------
[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5321d50
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5321d50
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5321d50
Branch: refs/heads/trunk
Commit: b5321d50bba3733e9dc359714eb658c191ca2975
Parents: 16f99c5 c562700
Author: Brandon Williams <br...@apache.org>
Authored: Mon Feb 10 09:37:43 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Feb 10 09:37:43 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/b5321d50/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------
[3/6] git commit: Partially revert MM.isReadyForBootstrap change from
6648 Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-6685
Posted by br...@apache.org.
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/trunk
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)
[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5321d50
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5321d50
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5321d50
Branch: refs/heads/cassandra-2.0
Commit: b5321d50bba3733e9dc359714eb658c191ca2975
Parents: 16f99c5 c562700
Author: Brandon Williams <br...@apache.org>
Authored: Mon Feb 10 09:37:43 2014 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Feb 10 09:37:43 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/b5321d50/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------
[2/6] git commit: Partially revert MM.isReadyForBootstrap change from
6648 Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-6685
Posted by br...@apache.org.
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)