Use refresh state in incremental schedules (#552)

Ericsson · Aug 21, 2023 · 1d4e8b4 · 1d4e8b4
1 parent bc5bfe2
commit 1d4e8b4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/.../src/main/java/com/ericsson/bss/cassandra/ecchronos/core/repair/IncrementalRepairJob.java b/.../src/main/java/com/ericsson/bss/cassandra/ecchronos/core/repair/IncrementalRepairJob.java
@@ -128,24 +128,16 @@ public Iterator<ScheduledTask> iterator()
     }
 
     /**
-     * Decides if the job is runnable.
-     *
-     * @return true if enough time has passed and there is something to repair.
+     * Check if there's anything to repair, if not then just move the last run.
      */
     @Override
-    public boolean runnable()
+    public void refreshState()
     {
-        if (super.runnable())
+        boolean nothingToRepair = getProgress() >= 1.0;
+        if (nothingToRepair)
         {
-            boolean nothingToRepair = getProgress() >= 1.0;
-            if (nothingToRepair)
-            {
-                myLastSuccessfulRun = System.currentTimeMillis();
-                return false;
-            }
-            return true;
+            myLastSuccessfulRun = System.currentTimeMillis();
         }
-        return false;
     }
 
     /**

diff --git a/.../test/java/com/ericsson/bss/cassandra/ecchronos/core/repair/TestIncrementalRepairJob.java b/.../test/java/com/ericsson/bss/cassandra/ecchronos/core/repair/TestIncrementalRepairJob.java
@@ -218,6 +218,7 @@ public void testRunnableNothingRepaired()
     {
         doReturn(0.0d).when(myCassandraMetrics).getPercentRepaired(myTableReference);
         IncrementalRepairJob job = getIncrementalRepairJob();
+        job.refreshState();
 
         assertThat(job).isNotNull();
         assertThat(job.runnable()).isTrue();
@@ -228,6 +229,7 @@ public void testRunnableHalfRepaired()
     {
         doReturn(50.0d).when(myCassandraMetrics).getPercentRepaired(myTableReference);
         IncrementalRepairJob job = getIncrementalRepairJob();
+        job.refreshState();
 
         assertThat(job).isNotNull();
         assertThat(job.runnable()).isTrue();
@@ -238,6 +240,7 @@ public void testRunnableEverythingRepaired()
     {
         doReturn(100.0d).when(myCassandraMetrics).getPercentRepaired(myTableReference);
         IncrementalRepairJob job = getIncrementalRepairJob();
+        job.refreshState();
 
         assertThat(job).isNotNull();
         assertThat(job.runnable()).isFalse();
@@ -249,6 +252,7 @@ public void testRunnableIntervalNotYetPassed()
         long lastRepairedAt = System.currentTimeMillis();
         doReturn(lastRepairedAt).when(myCassandraMetrics).getMaxRepairedAt(myTableReference);
         IncrementalRepairJob job = getIncrementalRepairJob();
+        job.refreshState();
 
         assertThat(job).isNotNull();
         assertThat(job.runnable()).isFalse();