summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2023-06-19 12:43:54 +0200
committerGitHub <noreply@github.com>2023-06-19 12:43:54 +0200
commitbab3e2b4130ba1461efa4280261693d1b34715e6 (patch)
tree3430fe2e47fb47351e690217c3bd2770c24c95ad
parent47bf88ed10ae83bc3b5e805776e2d93b816a35ac (diff)
parentb369efe2359530bfd9ae24c460469dea617aa3b6 (diff)
Merge pull request #27477 from vespa-engine/hmusum/return-easrly-if-shutting-down
Return early if shutting down
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java4
1 files changed, 3 insertions, 1 deletions
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 b01c87a6e37..4c5ea45f3ec 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
@@ -40,9 +40,11 @@ public class NodeMetricsDbMaintainer extends NodeRepositoryMaintainer {
Set<ApplicationId> applications = activeNodesByApplication().keySet();
if (applications.isEmpty()) return 1.0;
- long pauseMs = interval().toMillis() / Math.max(3, applications.size() - 1); // spread requests over interval
+ long pauseMs = interval().toMillis() / Math.max(4, applications.size()); // spread requests over interval
int done = 0;
for (ApplicationId application : applications) {
+ if (shuttingDown()) return asSuccessFactorDeviation(attempts, failures.get());
+
attempts++;
metricsFetcher.fetchMetrics(application)
.whenComplete((metricsResponse, exception) -> handleResponse(metricsResponse,