diff options
author | Harald Musum <musum@yahooinc.com> | 2023-06-16 09:12:53 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-06-16 09:12:53 +0200 |
commit | 8f770162b186c802adb3d601692011695026effa (patch) | |
tree | e9942b751f38a0180bef467f57b861df739e6d45 | |
parent | c4ee70e6e474f29afe7ab2ef09fb678c8f275b73 (diff) |
Make sure to shutdown maintainer properly
Call deconstruct on metrics fetcher
3 files changed, 12 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsFetcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsFetcher.java index b9f16a27d73..e7e826fec91 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsFetcher.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsFetcher.java @@ -1,11 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.autoscale; -import com.yahoo.collections.Pair; import com.yahoo.config.provision.ApplicationId; -import java.time.Instant; -import java.util.Collection; import java.util.concurrent.CompletableFuture; /** @@ -22,4 +19,6 @@ public interface MetricsFetcher { */ CompletableFuture<MetricsResponse> fetchMetrics(ApplicationId application); + void deconstruct(); + } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java index e28dac1c915..dd4839d131a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java @@ -62,6 +62,12 @@ public class NodeMetricsDbMaintainer extends NodeRepositoryMaintainer { } } + @Override + public void shutdown() { + super.shutdown(); + metricsFetcher.deconstruct(); + } + private void handleResponse(MetricsResponse response, Throwable exception, MutableInteger failures, diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockMetricsFetcher.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockMetricsFetcher.java index 97fea9648c6..6c6face7ba6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockMetricsFetcher.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockMetricsFetcher.java @@ -10,6 +10,7 @@ import java.util.concurrent.CompletableFuture; /** * @author bratseth */ +@SuppressWarnings("unused") // Injected in container from test code (services.xml) public class MockMetricsFetcher implements MetricsFetcher { @Override @@ -17,4 +18,7 @@ public class MockMetricsFetcher implements MetricsFetcher { return CompletableFuture.completedFuture(MetricsResponse.empty()); } + @Override + public void deconstruct() {} + } |