Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0C4D7200B29 for ; Thu, 26 May 2016 02:14:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0AE64160A29; Thu, 26 May 2016 00:14:01 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 604BD160A39 for ; Thu, 26 May 2016 02:14:00 +0200 (CEST) Received: (qmail 35694 invoked by uid 500); 26 May 2016 00:13:57 -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 35279 invoked by uid 99); 26 May 2016 00:13:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 May 2016 00:13:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3ED84DFD43; Thu, 26 May 2016 00:13:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Thu, 26 May 2016 00:14:09 -0000 Message-Id: <2fe79f8e559d4314a2c2d4cfa4445b90@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [13/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7 archived-at: Thu, 26 May 2016 00:14:01 -0000 Merge branch 'cassandra-3.0' into cassandra-3.7 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ecdbe3f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ecdbe3f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ecdbe3f9 Branch: refs/heads/cassandra-3.7 Commit: ecdbe3f91429a83029cef3464e42275f43e71075 Parents: ea14570 ed84bbc Author: Yuki Morishita Authored: Wed May 25 18:54:30 2016 -0500 Committer: Yuki Morishita Committed: Wed May 25 18:54:30 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +- .../org/apache/cassandra/dht/BootStrapper.java | 1 + .../org/apache/cassandra/dht/RangeStreamer.java | 48 +++++++++++++++----- .../cassandra/service/StorageService.java | 2 +- 4 files changed, 41 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecdbe3f9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2935e01,0277f16..9798d6a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -8,12 -6,11 +8,13 @@@ Merged from 3.0 Merged from 2.2: * Enable client encryption in sstableloader with cli options (CASSANDRA-11708) * Possible memory leak in NIODataInputStream (CASSANDRA-11867) - * Add message dropped tasks to nodetool netstats (CASSANDRA-11855) * Add seconds to cqlsh tracing session duration (CASSANDRA-11753) + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669) * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395) + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626) Merged from 2.1: + * Do not consider local node a valid source during replace (CASSANDRA-11848) + * Add message dropped tasks to nodetool netstats (CASSANDRA-11855) * Avoid holding SSTableReaders for duration of incremental repair (CASSANDRA-11739) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecdbe3f9/src/java/org/apache/cassandra/dht/BootStrapper.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/dht/BootStrapper.java index 902c584,1c40482..392dbf2 --- a/src/java/org/apache/cassandra/dht/BootStrapper.java +++ b/src/java/org/apache/cassandra/dht/BootStrapper.java @@@ -73,9 -73,9 +73,10 @@@ public class BootStrapper extends Progr "Bootstrap", useStrictConsistency, DatabaseDescriptor.getEndpointSnitch(), - stateStore); + stateStore, + true); streamer.addSourceFilter(new RangeStreamer.FailureDetectorSourceFilter(FailureDetector.instance)); + streamer.addSourceFilter(new RangeStreamer.ExcludeLocalNodeFilter()); for (String keyspaceName : Schema.instance.getNonLocalStrategyKeyspaces()) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecdbe3f9/src/java/org/apache/cassandra/dht/RangeStreamer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ecdbe3f9/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------