Revert "Emit a success factor from maintainers"

3 files changed, 15 insertions, 33 deletions

diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/JobControlTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/JobControlTest.java
index 01560c050ff..139a2901cd3 100644
--- a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/JobControlTest.java
+++ b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/JobControlTest.java
@@ -3,8 +3,6 @@ package com.yahoo.concurrent.maintenance;
 
 import org.junit.Test;
 
-import java.util.concurrent.atomic.AtomicLong;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -21,8 +19,9 @@ public class JobControlTest {
 
         String job1 = "Job1";
         String job2 = "Job2";
-        TestMaintainer maintainer1 = new TestMaintainer(job1, jobControl, new NoopJobMetrics());
-        TestMaintainer maintainer2 = new TestMaintainer(job2, jobControl, new NoopJobMetrics());
+        JobMetrics metrics = new JobMetrics((job, instant) -> {});
+        TestMaintainer maintainer1 = new TestMaintainer(job1, jobControl, metrics);
+        TestMaintainer maintainer2 = new TestMaintainer(job2, jobControl, metrics);
         assertEquals(2, jobControl.jobs().size());
         assertTrue(jobControl.jobs().contains(job1));
         assertTrue(jobControl.jobs().contains(job2));
@@ -63,7 +62,7 @@ public class JobControlTest {
     public void testJobControlMayDeactivateJobs() {
         JobControlStateMock state = new JobControlStateMock();
         JobControl jobControl = new JobControl(state);
-        TestMaintainer mockMaintainer = new TestMaintainer(null, jobControl, new NoopJobMetrics());
+        TestMaintainer mockMaintainer = new TestMaintainer(null, jobControl, new JobMetrics((job, instant) -> {}));
 
         assertTrue(jobControl.jobs().contains("TestMaintainer"));
 
@@ -81,11 +80,4 @@ public class JobControlTest {
         assertEquals(2, mockMaintainer.totalRuns());
     }
 
-    private static class NoopJobMetrics extends JobMetrics {
-
-        @Override
-        protected void recordCompletion(String job, Long incompleteRuns, double successFactor) { }
-
-    }
-
 }
diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java
index d2db380f4a1..e881d4b3ff6 100644
--- a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java
+++ b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/MaintainerTest.java
@@ -42,45 +42,35 @@ public class MaintainerTest {
 
     @Test
     public void success_metric() {
-        TestJobMetrics jobMetrics = new TestJobMetrics();
+        AtomicLong consecutiveFailures = new AtomicLong();
+        JobMetrics jobMetrics = new JobMetrics((job, count) -> consecutiveFailures.set(count));
         TestMaintainer maintainer = new TestMaintainer(null, jobControl, jobMetrics);
 
         // Maintainer fails twice in a row
         maintainer.successOnNextRun(false).run();
-        assertEquals(1, jobMetrics.consecutiveFailures.get());
+        assertEquals(1, consecutiveFailures.get());
         maintainer.successOnNextRun(false).run();
-        assertEquals(2, jobMetrics.consecutiveFailures.get());
+        assertEquals(2, consecutiveFailures.get());
 
         // Maintainer runs successfully
         maintainer.successOnNextRun(true).run();
-        assertEquals(0, jobMetrics.consecutiveFailures.get());
+        assertEquals(0, consecutiveFailures.get());
 
         // Maintainer runs successfully again
         maintainer.run();
-        assertEquals(0, jobMetrics.consecutiveFailures.get());
+        assertEquals(0, consecutiveFailures.get());
 
         // Maintainer throws
         maintainer.throwOnNextRun(new RuntimeException()).run();
-        assertEquals(1, jobMetrics.consecutiveFailures.get());
+        assertEquals(1, consecutiveFailures.get());
 
         // Maintainer recovers
         maintainer.throwOnNextRun(null).run();
-        assertEquals(0, jobMetrics.consecutiveFailures.get());
+        assertEquals(0, consecutiveFailures.get());
 
         // Lock exception is treated as a failure
         maintainer.throwOnNextRun(new UncheckedTimeoutException()).run();
-        assertEquals(1, jobMetrics.consecutiveFailures.get());
-    }
-
-    private static class TestJobMetrics extends JobMetrics {
-
-        AtomicLong consecutiveFailures = new AtomicLong();
-
-        @Override
-        protected void recordCompletion(String job, Long incompleteRuns, double successFactor) {
-            consecutiveFailures.set(incompleteRuns);
-        }
-
+        assertEquals(1, consecutiveFailures.get());
     }
 
 }
diff --git a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java
index 7424b17cab2..44a00a37a83 100644
--- a/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java
+++ b/vespajlib/src/test/java/com/yahoo/concurrent/maintenance/TestMaintainer.java
@@ -33,10 +33,10 @@ class TestMaintainer extends Maintainer {
     }
 
     @Override
-    protected double maintain() {
+    protected boolean maintain() {
         if (exceptionToThrow != null) throw exceptionToThrow;
         totalRuns++;
-        return success ? 1.0 : 0.0;
+        return success;
     }
 
 }