Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4858311E42 for ; Fri, 1 Aug 2014 15:51:49 +0000 (UTC) Received: (qmail 55955 invoked by uid 500); 1 Aug 2014 15:51:49 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 55926 invoked by uid 500); 1 Aug 2014 15:51:49 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 55914 invoked by uid 99); 1 Aug 2014 15:51:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Aug 2014 15:51:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B2FD39BD6B9; Fri, 1 Aug 2014 15:51:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Fri, 01 Aug 2014 15:51:48 -0000 Message-Id: <1fa76af3c70d44ceb576cff604c4c83e@git.apache.org> In-Reply-To: <05e130fec0fd463ca3ce24ad9f9bc5e0@git.apache.org> References: <05e130fec0fd463ca3ce24ad9f9bc5e0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/6] git commit: Don't use strict consistency when replacing 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 Authored: Fri Aug 1 10:50:34 2014 -0500 Committer: Brandon Williams 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> ranges) { - Multimap, InetAddress> rangesForKeyspace = useStrictConsistency && tokens != null + Multimap, InetAddress> rangesForKeyspace = !DatabaseDescriptor.isReplacing() && useStrictConsistency && tokens != null ? getAllRangesWithStrictSourcesFor(keyspaceName, ranges) : getAllRangesWithSourcesFor(keyspaceName, ranges); if (logger.isDebugEnabled())