Fix issue with incremental repair using new repair methods (issue #71)

Author: adejanovski

pom.xml

@@ -12,7 +12,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <dropwizard.version>0.7.1</dropwizard.version>
-        <dropwizard.cassandra.version>4.0.0</dropwizard.cassandra.version>
+        <dropwizard.cassandra.version>3.0.2</dropwizard.cassandra.version>
         <cassandra.version>2.2.7</cassandra.version>
         <cucumber.version>1.1.5</cucumber.version>
     </properties>

resource/cassandra-reaper-cassandra.yaml

@@ -49,6 +49,9 @@ cassandra:
   clusterName: "test"
   contactPoints: ["127.0.0.1"]
   keyspace: reaper_db
+  queryOptions:
+    consistencyLevel: LOCAL_QUORUM
+    serialConsistencyLevel: SERIAL
 
 autoScheduling:
   enabled: false

src/main/java/com/spotify/reaper/cassandra/JmxProxy.java

@@ -478,7 +478,9 @@ public int triggerRepairPost2dot2(boolean fullRepair, RepairParallelism repairPa
     options.put(RepairOption.TRACE_KEY, Boolean.toString(Boolean.FALSE));
     options.put(RepairOption.COLUMNFAMILIES_KEY, StringUtils.join(columnFamilies, ","));
     //options.put(RepairOption.PULL_REPAIR_KEY, Boolean.FALSE);
-    options.put(RepairOption.RANGES_KEY, beginToken.toString() + ":" + endToken.toString());
+    if (fullRepair) {
+      options.put(RepairOption.RANGES_KEY, beginToken.toString() + ":" + endToken.toString());
+    }
 
     //options.put(RepairOption.DATACENTERS_KEY, StringUtils.join(specificDataCenters, ","));
     //options.put(RepairOption.HOSTS_KEY, StringUtils.join(specificHosts, ","));

src/main/java/com/spotify/reaper/service/SegmentRunner.java

@@ -522,7 +522,8 @@ long intensityBasedDelayMillis(double intensity) {
       long repairDuration = repairEnd - repairStart;
       long delay = (long) (repairDuration / intensity - repairDuration);
       LOG.debug("Scheduling next runner run() with delay {} ms", delay);
-      return delay;
+      return delay>0?delay:1;
+
     } else {
       LOG.error("Segment {} returned with startTime {} and endTime {}. This should not happen."
                 + "Intensity cannot apply, so next run will start immediately.",