1 files changed, 8 insertions, 10 deletions
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 2a9e6dda6b6..3a5c7e3421d 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/maintenance/Maintainer.java
@@ -104,21 +104,19 @@ 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.starting(name());
+
         double successFactor = 0;
         try (var lock = jobControl.lockJob(name())) {
             successFactor = maintain();
-            if (successFactor > 0.0)
-                jobMetrics.recordCompletionOf(name());
-        } catch (UncheckedTimeoutException e) {
-            if (ignoreCollision) {
-                jobMetrics.recordCompletionOf(name());
-            } else {
+        }
+        catch (UncheckedTimeoutException e) {
+            if ( ! ignoreCollision)
                 log.log(Level.WARNING, this + " collided with another run. Will retry in " + interval);
-            }
-        } catch (Throwable e) {
+        }
+        catch (Throwable e) {
             log.log(Level.WARNING, this + " failed. Will retry in " + interval, e);
-        } finally {
+        }
+        finally {
             jobMetrics.completed(name(), successFactor);
         }
         log.log(Level.FINE, () -> "Finished " + this.getClass().getSimpleName());