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/11/07 04:29:00 UTC

[2/6] cassandra git commit: Don't tell users to turn off consistent rangemovements during rebuild.

Don't tell users to turn off consistent rangemovements during rebuild.

Patch by Kurt Greaves; reviewed by Jeff Jirsa for CASSANDRA-12296


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

Branch: refs/heads/cassandra-3.X
Commit: c3f24ef3795a8823e63d63a473e5f68b22f134bb
Parents: ec64cdf
Author: Kurt <ku...@instaclustr.com>
Authored: Thu Nov 3 23:52:47 2016 +0000
Committer: Jeff Jirsa <je...@crowdstrike.com>
Committed: Sun Nov 6 19:58:11 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                          | 1 +
 src/java/org/apache/cassandra/dht/RangeStreamer.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3f24ef3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 51d571b..9d431a9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 3.0.10
  * Fix CommitLogTest.testDeleteIfNotDirty (CASSANDRA-12854)
+ * Don't tell users to turn off consistent rangemovements during rebuild. (CASSANDRA-12296)
  * Avoid deadlock due to materialized view lock contention (CASSANDRA-12689)
  * Fix for KeyCacheCqlTest flakiness (CASSANDRA-12801)
  * Include SSTable filename in compacting large row message (CASSANDRA-12384)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3f24ef3/src/java/org/apache/cassandra/dht/RangeStreamer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java b/src/java/org/apache/cassandra/dht/RangeStreamer.java
index 38282c6..32e084f 100644
--- a/src/java/org/apache/cassandra/dht/RangeStreamer.java
+++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java
@@ -322,8 +322,8 @@ public class RangeStreamer
                 if (strat != null && strat.getReplicationFactor() == 1)
                 {
                     if (useStrictConsistency)
-                        throw new IllegalStateException("Unable to find sufficient sources for streaming range " + range + " in keyspace " + keyspace + " with RF=1." +
-                                                        "If you want to ignore this, consider using system property -Dcassandra.consistent.rangemovement=false.");
+                        throw new IllegalStateException("Unable to find sufficient sources for streaming range " + range + " in keyspace " + keyspace + " with RF=1. " +
+                                                        "Ensure this keyspace contains replicas in the source datacenter.");
                     else
                         logger.warn("Unable to find sufficient sources for streaming range " + range + " in keyspace " + keyspace + " with RF=1. " +
                                     "Keyspace might be missing data.");