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 E81D9200B7E for ; Tue, 23 Aug 2016 00:05:43 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E7269160AC4; Mon, 22 Aug 2016 22:05:43 +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 39C42160ABC for ; Tue, 23 Aug 2016 00:05:43 +0200 (CEST) Received: (qmail 11379 invoked by uid 500); 22 Aug 2016 22:05:41 -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 11296 invoked by uid 99); 22 Aug 2016 22:05:41 -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; Mon, 22 Aug 2016 22:05:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C0701E0551; Mon, 22 Aug 2016 22:05:41 +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: Mon, 22 Aug 2016 22:05:42 -0000 Message-Id: <54ad4df86fa14ff7bef0e08bc4616045@git.apache.org> In-Reply-To: <804d5d59c4ba44e7a442f2ccf7502b69@git.apache.org> References: <804d5d59c4ba44e7a442f2ccf7502b69@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [02/21] cassandra git commit: Include column family parameter when -st and -et are provided - subrange repair archived-at: Mon, 22 Aug 2016 22:05:44 -0000 Include column family parameter when -st and -et are provided - subrange repair Patch by Vinay Chella; Reviewed by Paulo Motta for CASSANDRA-11866 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95b2d024 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95b2d024 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95b2d024 Branch: refs/heads/cassandra-2.2 Commit: 95b2d0241c114fdb37f9b3e30c981ce7aa39e177 Parents: 527d189 Author: vchella Authored: Tue Jul 19 18:47:01 2016 -0700 Committer: Yuki Morishita Committed: Mon Aug 22 16:36:54 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeTool.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/95b2d024/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index dee669a..c1c6c78 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.16 + * Include column family parameter when -st and -et are provided (CASSANDRA-11866) * Fix queries with empty ByteBuffer values in clustering column restrictions (CASSANDRA-12127) * Disable passing control to post-flush after flush failure to prevent data loss (CASSANDRA-11828) * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040) http://git-wip-us.apache.org/repos/asf/cassandra/blob/95b2d024/src/java/org/apache/cassandra/tools/NodeTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java index 5af8240..d1afb6f 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -1947,7 +1947,7 @@ public class NodeTool else if(!specificHosts.isEmpty()) hosts = newArrayList(specificHosts); if (!startToken.isEmpty() || !endToken.isEmpty()) - probe.forceRepairRangeAsync(System.out, keyspace, parallelismDegree, dataCenters,hosts, startToken, endToken, !incrementalRepair); + probe.forceRepairRangeAsync(System.out, keyspace, parallelismDegree, dataCenters,hosts, startToken, endToken, !incrementalRepair, cfnames); else probe.forceRepairAsync(System.out, keyspace, parallelismDegree, dataCenters, hosts, primaryRange, !incrementalRepair, cfnames); } catch (Exception e)