cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject git commit: Make incremental repair default
Date Mon, 19 May 2014 06:48:16 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk a125bb068 -> 0c45727c4


Make incremental repair default

Patch by marcuse; reviewed by jbellis for CASSANDRA-7250


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c45727c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c45727c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c45727c

Branch: refs/heads/trunk
Commit: 0c45727c4b53693e3a1d2fbc1b538bddacad6a0a
Parents: a125bb0
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Fri May 16 16:24:09 2014 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon May 19 08:47:48 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                       | 1 +
 src/java/org/apache/cassandra/tools/NodeTool.java | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c45727c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e541e7e..c7b2cf2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,7 @@
  * Add Thrift get_multi_slice call (CASSANDRA-6757)
  * Optimize fetching multiple cells by name (CASSANDRA-6933)
  * Allow compilation in java 8 (CASSANDRA-7208)
+ * Make incremental repair default (CASSANDRA-7250)
 
 2.1.0-rc1
  * Add PowerShell Windows launch scripts (CASSANDRA-7001)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c45727c/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 8f2f261..64ebd9e 100644
--- a/src/java/org/apache/cassandra/tools/NodeTool.java
+++ b/src/java/org/apache/cassandra/tools/NodeTool.java
@@ -1604,8 +1604,8 @@ public class NodeTool
         @Option(title = "primary_range", name = {"-pr", "--partitioner-range"}, description
= "Use -pr to repair only the first range returned by the partitioner")
         private boolean primaryRange = false;
 
-        @Option(title = "incremental_repair", name = {"-inc", "--incremental"}, description
= "Use -inc to use the new incremental repair")
-        private boolean incrementalRepair = false;
+        @Option(title = "full", name = {"-full", "--full"}, description = "Use -full to issue
a full repair.")
+        private boolean fullRepair = false;
 
         @Override
         public void execute(NodeProbe probe)
@@ -1626,9 +1626,9 @@ public class NodeTool
                     else if(!specificHosts.isEmpty())
                         hosts = newArrayList(specificHosts);
                     if (!startToken.isEmpty() || !endToken.isEmpty())
-                        probe.forceRepairRangeAsync(System.out, keyspace, !parallel, dataCenters,hosts,
startToken, endToken, !incrementalRepair);
+                        probe.forceRepairRangeAsync(System.out, keyspace, !parallel, dataCenters,hosts,
startToken, endToken, fullRepair);
                     else
-                        probe.forceRepairAsync(System.out, keyspace, !parallel, dataCenters,
hosts, primaryRange, !incrementalRepair, cfnames);
+                        probe.forceRepairAsync(System.out, keyspace, !parallel, dataCenters,
hosts, primaryRange, fullRepair, cfnames);
                 } catch (Exception e)
                 {
                     throw new RuntimeException("Error occurred during repair", e);


Mime
View raw message