cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: Avoids possible deadlock during bootstrap due to not comparing schema UUID by timestamp
Date Tue, 17 Apr 2012 16:11:06 GMT
Updated Branches:
  refs/heads/cassandra-1.0 cb7a931ff -> 5434ac4a0


Avoids possible deadlock during bootstrap due to not comparing schema UUID by timestamp

patch by slebresne; reviewed by driftx for CASSANDRA-4159


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5434ac4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5434ac4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5434ac4a

Branch: refs/heads/cassandra-1.0
Commit: 5434ac4a063cc64d139a81aad353a203d52a2432
Parents: cb7a931
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Apr 17 18:09:46 2012 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Apr 17 18:09:46 2012 +0200

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../apache/cassandra/service/MigrationManager.java |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5434ac4a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 26d0011..f370ebc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
  * allow short snitch names (CASSANDRA-4130)
  * cqlsh: guess correct version of Python for Arch Linux (CASSANDRA-4090)
  * (CLI) properly handle quotes in create/update keyspace commands (CASSANDRA-4129)
+ * Avoids possible deadlock during bootstrap (CASSANDRA-4159)
 
 
 1.0.9

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5434ac4a/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 cf0cbcd..f9e5c33 100644
--- a/src/java/org/apache/cassandra/service/MigrationManager.java
+++ b/src/java/org/apache/cassandra/service/MigrationManager.java
@@ -124,7 +124,7 @@ public class MigrationManager implements IEndpointStateChangeSubscriber
 
     public static boolean isReadyForBootstrap()
     {
-        return highestKnown.compareTo(Schema.instance.getVersion()) == 0;
+        return highestKnown.timestamp() == Schema.instance.getVersion().timestamp();
     }
 
     private static void pushMigrations(InetAddress endpoint, Collection<IColumn> migrations)


Mime
View raw message