2 files changed, 30 insertions, 18 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/JobMetrics.java b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/JobMetrics.java
index fcc5b8e57a2..73a5dc77743 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/JobMetrics.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/JobMetrics.java
@@ -2,25 +2,18 @@
 package com.yahoo.concurrent.maintenance;
 
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.BiConsumer;
 
 /**
  * Tracks and forwards maintenance job metrics.
  *
  * @author mpolden
  */
-public class JobMetrics {
-
-    private final BiConsumer<String, Long> metricConsumer;
+public abstract class JobMetrics {
 
     private final ConcurrentHashMap<String, Long> incompleteRuns = new ConcurrentHashMap<>();
 
-    public JobMetrics(BiConsumer<String, Long> metricConsumer) {
-        this.metricConsumer = metricConsumer;
-    }
-
-    /** Record a run for given job */
-    public void recordRunOf(String job) {
+    /** Record starting of a run of a job */
+    public void starting(String job) {
         incompleteRuns.merge(job, 1L, Long::sum);
     }
 
@@ -29,12 +22,17 @@ public class JobMetrics {
         incompleteRuns.put(job, 0L);
     }
 
-    /** Forward metrics for given job to metric consumer */
-    public void forward(String job) {
+    /**
+     * Records completion of a run of a job.
+     * This is guaranteed to always be called once whenever starting has been called.
+     */
+    public void completed(String job, double successFactor) {
         Long incompleteRuns = this.incompleteRuns.get(job);
         if (incompleteRuns != null) {
-            metricConsumer.accept(job, incompleteRuns);
+            recordCompletion(job, incompleteRuns, successFactor);
         }
     }
 
+    protected abstract void recordCompletion(String job, Long incompleteRuns, double successFactor);
+
 }
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java
index 734c46a2819..2a9e6dda6b6 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java
@@ -83,8 +83,19 @@ public abstract class Maintainer implements Runnable {
     @Override
     public final String toString() { return name(); }
 
-    /** Called once each time this maintenance job should run. Returns whether the maintenance run was successful */
-    protected abstract boolean maintain();
+    /**
+     * Called once each time this maintenance job should run.
+     *
+     * @return the degree to which the run was successful - a number between 0 (no success), to 1 (complete success).
+     *         Note that this indicates whether something is wrong, so e.g if the call did nothing because it should do
+     *         nothing,  1.0 should be returned.
+     */
+    protected abstract double maintain();
+
+    /** Convenience methods to convert attempts and failures into a success factor */
+    protected final double asSuccessFactor(int attempts, int failures) {
+        return attempts == 0 ? 1.0 : 1 - (double)failures / attempts;
+    }
 
     /** Returns the interval at which this job is set to run */
     protected Duration interval() { return interval; }
@@ -93,9 +104,12 @@ public abstract class Maintainer implements Runnable {
     public final void lockAndMaintain(boolean force) {
         if (!force && !jobControl.isActive(name())) return;
         log.log(Level.FINE, () -> "Running " + this.getClass().getSimpleName());
-        jobMetrics.recordRunOf(name());
+        jobMetrics.starting(name());
+        double successFactor = 0;
         try (var lock = jobControl.lockJob(name())) {
-            if (maintain()) jobMetrics.recordCompletionOf(name());
+            successFactor = maintain();
+            if (successFactor > 0.0)
+                jobMetrics.recordCompletionOf(name());
         } catch (UncheckedTimeoutException e) {
             if (ignoreCollision) {
                 jobMetrics.recordCompletionOf(name());
@@ -105,7 +119,7 @@ public abstract class Maintainer implements Runnable {
         } catch (Throwable e) {
             log.log(Level.WARNING, this + " failed. Will retry in " + interval, e);
         } finally {
-            jobMetrics.forward(name());
+            jobMetrics.completed(name(), successFactor);
         }
         log.log(Level.FINE, () -> "Finished " + this.getClass().getSimpleName());
     }