Record successFactor

2 files changed, 11 insertions, 1 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintainer.java
index f8c0dcb1e14..810c412fcc0 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintainer.java
@@ -56,8 +56,9 @@ public abstract class ControllerMaintainer extends Maintainer {
         }
 
         @Override
-        protected void consume(String job, Long incompleteRuns) {
+        protected void recordCompletion(String job, Long incompleteRuns, double successFactor) {
             metric.set("maintenance.consecutiveFailures", incompleteRuns, metric.createContext(Map.of("job", job)));
+            metric.set("maintenance.successFactor", successFactor, metric.createContext(Map.of("job", job)));
         }
 
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintainerTest.java
index 27b4f3744e7..c932ff25594 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintainerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintainerTest.java
@@ -39,13 +39,16 @@ public class ControllerMaintainerTest {
         TestControllerMaintainer maintainer = new TestControllerMaintainer(tester.controller(), SystemName.main, new AtomicInteger());
         maintainer.run();
         assertEquals(0L, consecutiveFailuresMetric());
+        assertEquals(1.0, successFactorMetric(), 0.0000001);
         maintainer.success = false;
         maintainer.run();
         maintainer.run();
         assertEquals(2L, consecutiveFailuresMetric());
+        assertEquals(0.0, successFactorMetric(), 0.0000001);
         maintainer.success = true;
         maintainer.run();
         assertEquals(0, consecutiveFailuresMetric());
+        assertEquals(1.0, successFactorMetric(), 0.0000001);
     }
 
     private long consecutiveFailuresMetric() {
@@ -54,6 +57,12 @@ public class ControllerMaintainerTest {
                                  "maintenance.consecutiveFailures").get().longValue();
     }
 
+    private long successFactorMetric() {
+        MetricsMock metrics = (MetricsMock) tester.controller().metric();
+        return metrics.getMetric((context) -> "TestControllerMaintainer".equals(context.get("job")),
+                                 "maintenance.successFactor").get().longValue();
+    }
+
     private static class TestControllerMaintainer extends ControllerMaintainer {
 
         private final AtomicInteger executions;