Don't use strict consistency when replacing Patch by brandonwilliams, reviewed by tjake for CASSANDRA-7568
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f48723b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f48723b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f48723b Branch: refs/heads/trunk Commit: 2f48723bfff605af31102fcfcd767b3dc878e097 Parents: 080aa94 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Aug 1 10:50:34 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Aug 1 10:50:34 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/dht/RangeStreamer.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f48723b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f6f30fa..a8299c6 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.0-final + * Don't use strict consistency when replacing (CASSANDRA-7568) * Fix min/max cell name collection on 2.0 SSTables with range tombstones (CASSANDRA-7593) * Tolerate min/max cell names of different lengths (CASSANDRA-7651) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f48723b/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 2308d30..14d24fc 100644 --- a/src/java/org/apache/cassandra/dht/RangeStreamer.java +++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java @@ -128,7 +128,7 @@ public class RangeStreamer public void addRanges(String keyspaceName, Collection<Range<Token>> ranges) { - Multimap<Range<Token>, InetAddress> rangesForKeyspace = useStrictConsistency && tokens != null + Multimap<Range<Token>, InetAddress> rangesForKeyspace = !DatabaseDescriptor.isReplacing() && useStrictConsistency && tokens != null ? getAllRangesWithStrictSourcesFor(keyspaceName, ranges) : getAllRangesWithSourcesFor(keyspaceName, ranges); if (logger.isDebugEnabled())
