From 28713778abe29c1d9120d2127354b7fd5ee8fff1 Mon Sep 17 00:00:00 2001 From: Jeff Jirsa Date: Fri, 21 Oct 2016 19:01:27 -0700 Subject: [PATCH] Split consistent range movement flag correction Patch by Sankalp Kohli; Reviewed by Jeff Jirsa for CASSANDRA-12786 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index efd0f5cbd4..8b61da43a6 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 diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index db8629433c..58c2bac0c1 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 ||