Merge pull request #127 from Bj0rnen/FixRepairParallelismInOverview

Fix repair parallelism in cluster overview output, for schedules/runs…
spotify · Jun 28, 2017 · 87d82ac · 87d82ac
2 parents 9083791 + 36c9b3d
commit 87d82ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/src/main/java/com/spotify/reaper/storage/postgresql/RepairRunStatusMapper.java b/src/main/java/com/spotify/reaper/storage/postgresql/RepairRunStatusMapper.java
@@ -37,12 +37,8 @@ public RepairRunStatus map(int index, ResultSet r, StatementContext ctx) throws
     DateTime pauseTime = RepairRunMapper.getDateTimeOrNull(r, "pause_time");
     Double intensity = r.getDouble("intensity");
     Boolean incrementalRepair = r.getBoolean("incremental_repair");
-    String repairParallelismStr = r.getString("repair_parallelism");
-    if (repairParallelismStr != null)
-    {
-      repairParallelismStr = repairParallelismStr.toUpperCase();
-    }
-    RepairParallelism repairParallelism = RepairParallelism.fromName(repairParallelismStr);
+    RepairParallelism repairParallelism =
+        RepairParallelism.fromName(r.getString("repair_parallelism").toLowerCase().replace("datacenter_aware", "dc_parallel"));
 
     return new RepairRunStatus(fromSequenceId(runId), clusterName, keyspaceName, columnFamilies, segmentsRepaired,
         totalSegments, state, startTime, endTime, cause, owner, lastEvent,

diff --git a/src/main/java/com/spotify/reaper/storage/postgresql/RepairScheduleStatusMapper.java b/src/main/java/com/spotify/reaper/storage/postgresql/RepairScheduleStatusMapper.java
@@ -34,13 +34,6 @@ public class RepairScheduleStatusMapper implements ResultSetMapper<RepairSchedul
   public RepairScheduleStatus map(int index, ResultSet r, StatementContext ctx)
       throws SQLException {
 
-    String repairParallelismStr = r.getString("repair_parallelism");
-    if (repairParallelismStr != null)
-    {
-      repairParallelismStr = repairParallelismStr.toUpperCase();
-    }
-    RepairParallelism repairParallelism = RepairParallelism.fromName(repairParallelismStr);
-
     return new RepairScheduleStatus(
         fromSequenceId(r.getLong("id")),
         r.getString("owner"),
@@ -54,7 +47,7 @@ public RepairScheduleStatus map(int index, ResultSet r, StatementContext ctx)
         r.getDouble("intensity"),
         r.getBoolean("incremental_repair"),
         r.getInt("segment_count"),
-        repairParallelism,
+        RepairParallelism.fromName(r.getString("repair_parallelism").toLowerCase().replace("datacenter_aware", "dc_parallel")),
         r.getInt("days_between")
     );
   }