cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [01/10] cassandra git commit: Split consistent range movement flag correction
Date Sat, 22 Oct 2016 02:08:57 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 a370409c8 -> 28713778a
  refs/heads/cassandra-3.0 7976d65af -> 5883e4358
  refs/heads/cassandra-3.X 575927b1e -> d4a914d21
  refs/heads/trunk 2e15fc37f -> aedb2187a


Split consistent range movement flag correction

Patch by Sankalp Kohli; Reviewed by Jeff Jirsa for CASSANDRA-12786


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

Branch: refs/heads/cassandra-2.2
Commit: 28713778abe29c1d9120d2127354b7fd5ee8fff1
Parents: a370409
Author: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Authored: Fri Oct 21 19:01:27 2016 -0700
Committer: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Committed: Fri Oct 21 19:01:27 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/28713778/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index efd0f5c..8b61da4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
  * Fix merkle tree depth calculation (CASSANDRA-12580)
  * Make Collections deserialization more robust (CASSANDRA-12618)
  * Better handle invalid system roles table (CASSANDRA-12700)
+ * Split consistent range movement flag correction (CASSANDRA-12786)
 Merged from 2.1:
 =======
 2.1.17

http://git-wip-us.apache.org/repos/asf/cassandra/blob/28713778/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index db86294..58c2bac 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -798,7 +798,7 @@ public class StorageService extends NotificationBroadcasterSupport implements
IE
 
             logger.debug("... got ring + schema info");
 
-            if (useStrictConsistency &&
+            if (useStrictConsistency && !allowSimultaneousMoves() &&
                     (
                         tokenMetadata.getBootstrapTokens().valueSet().size() > 0 ||
                         tokenMetadata.getLeavingEndpoints().size() > 0 ||


Mime
View raw message