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 66EA118C9A for ; Thu, 17 Mar 2016 12:12:24 +0000 (UTC) Received: (qmail 30678 invoked by uid 500); 17 Mar 2016 12:12:24 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 30640 invoked by uid 500); 17 Mar 2016 12:12:24 -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 30629 invoked by uid 99); 17 Mar 2016 12:12:24 -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, 17 Mar 2016 12:12:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E9BE1DFA43; Thu, 17 Mar 2016 12:12:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Message-Id: <5c047fa2a2b64c2c9861ac80b4351edc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cassandra git commit: Change repair message for keyspaces with RF 1 Date: Thu, 17 Mar 2016 12:12:23 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/trunk b210bd234 -> 6a8c747c6 Change repair message for keyspaces with RF 1 Patch by Branimir Lambov; reviewed by marcuse for CASSANDRA-11203 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a8c747c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a8c747c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a8c747c Branch: refs/heads/trunk Commit: 6a8c747c65833674057044f07c39418c5fe6302f Parents: b210bd2 Author: Branimir Lambov Authored: Thu Mar 17 13:19:00 2016 +0200 Committer: Marcus Eriksson Committed: Thu Mar 17 13:11:11 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/RepairRunner.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a8c747c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 311c1fa..df6d950 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,7 @@ 3.6 * Store repair options in parent_repair_history (CASSANDRA-11244) * Print current leveling in sstableofflinerelevel (CASSANDRA-9588) + * Change repair message for keyspaces with RF 1 (CASSANDRA-11203) * Remove hard-coded SSL cipher suites and protocols (CASSANDRA-10508) * Improve concurrency in CompactionStrategyManager (CASSANDRA-10099) * (cqlsh) interpret CQL type for formatting blobs (CASSANDRA-11274) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a8c747c/src/java/org/apache/cassandra/tools/RepairRunner.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/RepairRunner.java b/src/java/org/apache/cassandra/tools/RepairRunner.java index 0813775..8497a1b 100644 --- a/src/java/org/apache/cassandra/tools/RepairRunner.java +++ b/src/java/org/apache/cassandra/tools/RepairRunner.java @@ -56,7 +56,8 @@ public class RepairRunner extends JMXNotificationProgressListener cmd = ssProxy.repairAsync(keyspace, options); if (cmd <= 0) { - String message = String.format("[%s] Nothing to repair for keyspace '%s'", format.format(System.currentTimeMillis()), keyspace); + // repairAsync can only return 0 for replication factor 1. + String message = String.format("[%s] Replication factor is 1. No repair is needed for keyspace '%s'", format.format(System.currentTimeMillis()), keyspace); out.println(message); } else