Add duration and ETA to RepairRunStatus

Author: Bj0rnen

src/main/java/com/spotify/reaper/resources/CommonTools.java

@@ -29,6 +29,8 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.annotation.Nullable;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
 public class CommonTools {
@@ -245,7 +247,8 @@ public static RepairUnit getNewOrExistingRepairUnit(AppContext context, Cluster
     return theRepairUnit;
   }
 
-  public static String dateTimeToISO8601(DateTime dateTime) {
+  @Nullable
+  public static String dateTimeToISO8601(@Nullable DateTime dateTime) {
     if (null == dateTime) {
       return null;
     }

src/main/java/com/spotify/reaper/resources/view/RepairRunStatus.java

@@ -16,11 +16,13 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.spotify.reaper.core.RepairRun;
-import com.spotify.reaper.core.RepairSegment;
 import com.spotify.reaper.core.RepairUnit;
 import com.spotify.reaper.resources.CommonTools;
 
+import org.apache.cassandra.repair.RepairParallelism;
+import org.apache.commons.lang.time.DurationFormatUtils;
 import org.joda.time.DateTime;
+import org.joda.time.Duration;
 import org.joda.time.format.ISODateTimeFormat;
 
 import java.util.Collection;
@@ -48,8 +50,8 @@ public class RepairRunStatus {
   @JsonProperty("keyspace_name")
   private String keyspaceName;
 
-  @JsonProperty("run_state")
-  private String runState;
+  @JsonProperty
+  private RepairRun.RunState state;
 
   @JsonIgnore
   private DateTime creationTime;
@@ -66,18 +68,24 @@ public class RepairRunStatus {
   @JsonProperty
   private double intensity;
 
-  @JsonProperty("segment_count")
-  private int segmentCount;
+  @JsonProperty("total_segments")
+  private int totalSegments;
 
   @JsonProperty("repair_parallelism")
-  private String repairParallelism;
+  private RepairParallelism repairParallelism;
 
   @JsonProperty("segments_repaired")
   private int segmentsRepaired;
 
   @JsonProperty("last_event")
   private String lastEvent;
 
+  @JsonProperty
+  private String duration;
+
+  @JsonIgnore
+  private DateTime estimatedTimeOfArrival;
+
   /**
    * Default public constructor Required for Jackson JSON parsing.
    */
@@ -91,23 +99,45 @@ public RepairRunStatus(RepairRun repairRun, RepairUnit repairUnit, int segmentsR
     this.clusterName = repairRun.getClusterName();
     this.columnFamilies = repairUnit.getColumnFamilies();
     this.keyspaceName = repairUnit.getKeyspaceName();
-    this.runState = repairRun.getRunState().name();
+    this.state = repairRun.getRunState();
     this.creationTime = repairRun.getCreationTime();
     this.startTime = repairRun.getStartTime();
     this.endTime = repairRun.getEndTime();
     this.pauseTime = repairRun.getPauseTime();
     this.intensity = CommonTools.roundDoubleNicely(repairRun.getIntensity());
-    this.segmentCount = repairRun.getSegmentCount();
-    this.repairParallelism = repairRun.getRepairParallelism().name().toLowerCase();
+    this.totalSegments = repairRun.getSegmentCount();
+    this.repairParallelism = repairRun.getRepairParallelism();
     this.segmentsRepaired = segmentsRepaired;
     this.lastEvent = repairRun.getLastEvent();
+
+    if (startTime == null || endTime == null) {
+      duration = null;
+    } else {
+      duration = DurationFormatUtils.formatDurationWords(
+          new Duration(startTime.toInstant(), endTime.toInstant()).getMillis(),
+          true, false);
+    }
+
+    if (startTime == null || endTime != null) {
+      estimatedTimeOfArrival = null;
+    } else {
+      if (state == RepairRun.RunState.ERROR || state == RepairRun.RunState.DELETED) {
+        estimatedTimeOfArrival = null;
+      } else if (segmentsRepaired == 0) {
+        estimatedTimeOfArrival = null;
+      }
+      else {
+        long now = DateTime.now().getMillis();
+        long currentDuration = now - startTime.getMillis();
+        long millisecondsPerSegment = currentDuration / segmentsRepaired;
+        int segmentsLeft = totalSegments - segmentsRepaired;
+        estimatedTimeOfArrival = new DateTime(now + millisecondsPerSegment * segmentsLeft);
+      }
+    }
   }
 
   @JsonProperty("creation_time")
   public String getCreationTimeISO8601() {
-    if (creationTime == null) {
-      return null;
-    }
     return CommonTools.dateTimeToISO8601(creationTime);
   }
 
@@ -120,9 +150,6 @@ public void setCreationTimeISO8601(String dateStr) {
 
   @JsonProperty("start_time")
   public String getStartTimeISO8601() {
-    if (startTime == null) {
-      return null;
-    }
     return CommonTools.dateTimeToISO8601(startTime);
   }
 
@@ -135,9 +162,6 @@ public void setStartTimeISO8601(String dateStr) {
 
   @JsonProperty("end_time")
   public String getEndTimeISO8601() {
-    if (endTime == null) {
-      return null;
-    }
     return CommonTools.dateTimeToISO8601(endTime);
   }
 
@@ -150,9 +174,6 @@ public void setEndTimeISO8601(String dateStr) {
 
   @JsonProperty("pause_time")
   public String getPauseTimeISO8601() {
-    if (pauseTime == null) {
-      return null;
-    }
     return CommonTools.dateTimeToISO8601(pauseTime);
   }
 
@@ -211,12 +232,12 @@ public void setKeyspaceName(String keyspaceName) {
     this.keyspaceName = keyspaceName;
   }
 
-  public String getRunState() {
-    return runState;
+  public RepairRun.RunState getState() {
+    return state;
   }
 
-  public void setRunState(String runState) {
-    this.runState = runState;
+  public void setState(RepairRun.RunState runState) {
+    this.state = runState;
   }
 
   public DateTime getCreationTime() {
@@ -259,19 +280,19 @@ public void setIntensity(double intensity) {
     this.intensity = intensity;
   }
 
-  public int getSegmentCount() {
-    return segmentCount;
+  public int getTotalSegments() {
+    return totalSegments;
   }
 
-  public void setSegmentCount(int segmentCount) {
-    this.segmentCount = segmentCount;
+  public void setTotalSegments(int segmentCount) {
+    this.totalSegments = segmentCount;
   }
 
-  public String getRepairParallelism() {
+  public RepairParallelism getRepairParallelism() {
     return repairParallelism;
   }
 
-  public void setRepairParallelism(String repairParallelism) {
+  public void setRepairParallelism(RepairParallelism repairParallelism) {
     this.repairParallelism = repairParallelism;
   }
 
@@ -290,4 +311,24 @@ public String getLastEvent() {
   public void setLastEvent(String lastEvent) {
     this.lastEvent = lastEvent;
   }
+
+  public String getDuration() {
+    return duration;
+  }
+
+  public void setDuration(String duration) {
+    this.duration = duration;
+  }
+
+  @JsonProperty("estimate_time_of_arrival")
+  public String getEstimatedTimeOfArrivalISO8601() {
+    return CommonTools.dateTimeToISO8601(estimatedTimeOfArrival);
+  }
+
+  @JsonProperty("estimate_time_of_arrival")
+  public void setEstimatedTimeOfArrivalISO8601(String dateStr) {
+    if (null != dateStr) {
+      estimatedTimeOfArrival = ISODateTimeFormat.dateTimeNoMillis().parseDateTime(dateStr);
+    }
+  }
 }

src/test/java/com/spotify/reaper/unit/resources/RepairRunResourceTest.java

@@ -190,7 +190,7 @@ public void testTriggerRepairRun() throws Exception {
     assertTrue(response.getEntity() instanceof RepairRunStatus);
     // the thing we get as a reply from the endpoint is a not started run. This is because the
     // executor didn't have time to start the run
-    assertEquals(RepairRun.RunState.NOT_STARTED.name(), repairRunStatus.getRunState());
+    assertEquals(RepairRun.RunState.NOT_STARTED, repairRunStatus.getState());
 
     // give the executor some time to actually start the run
     Thread.sleep(50);