Merge pull request #18324 from vespa-engine/bratseth/remove-consecutiveFailures

Remove consecutiveFailures metric: Not needed

2 files changed, 1 insertions, 5 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 810c412fcc0..f7c4a95baf1 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,7 @@ public abstract class ControllerMaintainer extends Maintainer {
         }
 
         @Override
-        protected void recordCompletion(String job, Long incompleteRuns, double successFactor) {
-            metric.set("maintenance.consecutiveFailures", incompleteRuns, metric.createContext(Map.of("job", job)));
+        public void completed(String job, double successFactor) {
             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 7dc5cb34818..4bdb657d3af 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
@@ -38,16 +38,13 @@ public class ControllerMaintainerTest {
     public void records_metric() {
         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);
     }