diff options
| author | jonmv <venstad@gmail.com> | 2023-08-22 16:42:54 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-08-22 16:42:54 +0200 |
| commit | fdbf5f24413568c18aa0e2a42de7ae5f1df39913 (patch) | |
| tree | c7ff4919553bca68750293b7735ee97d5985e853 /node-repository | |
| parent | 3ed739122e2bd5f029a7a68cfa99dafaa6ddefd5 (diff) | |
Shut down super-lengthy maintainers faster
Diffstat (limited to 'node-repository')
2 files changed, 4 insertions, 0 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java index 6a01a2bcd18..8638087c5cd 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java @@ -57,11 +57,13 @@ public class AutoscalingMaintainer extends NodeRepositoryMaintainer { int attempts = 0; int failures = 0; + outer: for (var applicationNodes : activeNodesByApplication().entrySet()) { boolean enabled = enabledFlag.with(FetchVector.Dimension.APPLICATION_ID, applicationNodes.getKey().serializedForm()).value(); if (!enabled) continue; for (var clusterNodes : nodesByCluster(applicationNodes.getValue()).entrySet()) { + if (shuttingDown()) break outer; attempts++; if ( ! autoscale(applicationNodes.getKey(), clusterNodes.getKey())) failures++; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java index 4071559d841..60688e3f460 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainer.java @@ -41,8 +41,10 @@ public class ScalingSuggestionsMaintainer extends NodeRepositoryMaintainer { int attempts = 0; int failures = 0; + outer: for (var application : activeNodesByApplication().entrySet()) { for (var cluster : nodesByCluster(application.getValue()).entrySet()) { + if (shuttingDown()) break outer; attempts++; if ( ! suggest(application.getKey(), cluster.getKey(), cluster.getValue())) failures++; |