Increment RepairRun.completedSegments on finished segment

thelastpickle · Dec 12, 2014 · 4eb44a6 · 4eb44a6
1 parent be31956
commit 4eb44a6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/java/com/spotify/reaper/core/RepairRun.java b/src/main/java/com/spotify/reaper/core/RepairRun.java
@@ -74,11 +74,10 @@ public int getCompletedSegments() {
   }
 
   public static RepairRun getCopy(RepairRun repairRun, RunState newState,
-                                  DateTime startTime, DateTime endTime,
-                                  int totalSegments, int completedSegments) {
+                                  DateTime startTime, DateTime endTime, int completedSegments) {
     return new RepairRun.Builder(newState,
                                  repairRun.getCreationTime(), repairRun.getIntensity(),
-                                 totalSegments, completedSegments)
+                                 repairRun.getTotalSegments(), completedSegments)
         .cause(repairRun.getCause())
         .owner(repairRun.getOwner())
         .startTime(startTime)

diff --git a/src/main/java/com/spotify/reaper/service/RepairRunner.java b/src/main/java/com/spotify/reaper/service/RepairRunner.java
@@ -253,7 +253,7 @@ private void changeCurrentRepairRunState(RepairRun.RunState newRunState) {
         updatedRun =
         RepairRun
             .getCopy(repairRun, newRunState, newStartTime, newEndTime,
-                     repairRun.getTotalSegments(), repairRun.getCompletedSegments());
+                     repairRun.getCompletedSegments());
     if (!storage.updateRepairRun(updatedRun)) {
       LOG.error("failed updating repair run status: {}", repairRun.getId());
       // TODO: what should we do if we fail to update storage?
@@ -308,6 +308,10 @@ public void handle(int repairNumber, ActiveRepairService.Status status, String m
                                     currentSegment.getRepairCommandId(),
                                     currentSegment.getStartTime(), DateTime.now());
           storage.updateRepairSegment(currentSegment);
+          repairRun =
+              RepairRun.getCopy(repairRun, repairRun.getState(), repairRun.getStartTime(),
+                                repairRun.getEndTime(), repairRun.getCompletedSegments() + 1);
+          storage.updateRepairRun(repairRun);
           checkIfNeedToStartNextSegment();
           break;
       }