From f3efc9b88eba737b5036a60a381ced8960a26560 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Thu, 16 Jul 2020 09:56:14 +0200 Subject: Emit QoS metric for all maintainers --- .../controller/maintenance/ControllerMaintainerTest.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'controller-server/src/test/java/com/yahoo') 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 1151fdd07f0..4218e66703f 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 @@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.controller.maintenance; import com.yahoo.config.provision.SystemName; import com.yahoo.vespa.hosted.controller.ControllerTester; +import com.yahoo.vespa.hosted.controller.integration.MetricsMock; import org.junit.Before; import org.junit.Test; @@ -32,12 +33,21 @@ public class ControllerMaintainerTest { assertEquals(1, executions.get()); } + @Test + public void records_metric() { + maintainerIn(SystemName.main, new AtomicInteger()).run(); + MetricsMock metrics = (MetricsMock) tester.controller().metric(); + assertEquals(0L, metrics.getMetric((context) -> "MockMaintainer".equals(context.get("job")), + "maintenance.secondsSinceSuccess").get()); + } + private ControllerMaintainer maintainerIn(SystemName system, AtomicInteger executions) { return new ControllerMaintainer(tester.controller(), Duration.ofDays(1), "MockMaintainer", EnumSet.of(system)) { @Override - protected void maintain() { + protected boolean maintain() { executions.incrementAndGet(); + return true; } }; } -- cgit v1.2.3