Fix realPriority when nothing to repair

Ericsson · Aug 14, 2023 · d846264 · d846264
1 parent 751844e
commit d846264
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/core/src/main/java/com/ericsson/bss/cassandra/ecchronos/core/repair/TableRepairJob.java b/core/src/main/java/com/ericsson/bss/cassandra/ecchronos/core/repair/TableRepairJob.java
@@ -208,7 +208,8 @@ public boolean runnable()
     public final int getRealPriority()
     {
         RepairStateSnapshot repairStateSnapshot = myRepairState.getSnapshot();
-        int priority = -1;
+        // Default to lastRepairedAt, unless we have repairGroups that we can repair.
+        int priority = getRealPriority(getLastSuccessfulRun());
         if (repairStateSnapshot.canRepair())
         {
             long minRepairedAt = System.currentTimeMillis();

diff --git a/core/src/test/java/com/ericsson/bss/cassandra/ecchronos/core/repair/TestTableRepairJob.java b/core/src/test/java/com/ericsson/bss/cassandra/ecchronos/core/repair/TestTableRepairJob.java
@@ -557,6 +557,15 @@ public void testGetRealPrioritySnapshotLastRepairedAtLowerThanRepairGroups()
         assertThat(myRepairJob.getRealPriority()).isEqualTo(2);
     }
 
+    @Test
+    public void testGetRealPriorityNothingToRepair()
+    {
+        long lastRepaired = System.currentTimeMillis() - (TimeUnit.DAYS.toMillis(RUN_INTERVAL_IN_DAYS));
+        doReturn(lastRepaired).when(myRepairStateSnapshot).lastRepairedAt();
+        doReturn(false).when(myRepairStateSnapshot).canRepair();
+        assertThat(myRepairJob.getRealPriority()).isEqualTo(1);
+    }
+
     private void mockRepairGroup(long lastRepairedAt)
     {
         mockRepairGroup(getRepairGroup(new LongTokenRange(1, 2), lastRepairedAt));