You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jj...@apache.org on 2016/10/22 02:08:59 UTC
[03/10] cassandra git commit: Split consistent range movement flag
correction
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-3.X
Commit: 28713778abe29c1d9120d2127354b7fd5ee8fff1
Parents: a370409
Author: Jeff Jirsa <je...@crowdstrike.com>
Authored: Fri Oct 21 19:01:27 2016 -0700
Committer: Jeff Jirsa <je...@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 ||