summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-06-29 09:38:06 +0200
committerMartin Polden <mpolden@mpolden.no>2021-06-29 09:41:33 +0200
commit5e0d7c9657b7a388955b5eef80f85b162b5139a6 (patch)
treec056e78e431d8462aff50efe339a7257aabd4da1 /controller-server
parent9b7582100d7752185dd94a1dceea5b625c26044c (diff)
Return from slow loop when shutting down
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdater.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdater.java
index 0af0d01478b..8c891339e29 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdater.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/TrafficShareUpdater.java
@@ -1,7 +1,6 @@
// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.controller.maintenance;
-import com.yahoo.config.provision.SystemName;
import com.yahoo.vespa.hosted.controller.ApplicationController;
import com.yahoo.vespa.hosted.controller.Controller;
import com.yahoo.vespa.hosted.controller.Instance;
@@ -30,7 +29,7 @@ public class TrafficShareUpdater extends ControllerMaintainer {
private final NodeRepository nodeRepository;
public TrafficShareUpdater(Controller controller, Duration duration) {
- super(controller, duration, TrafficShareUpdater.class.getSimpleName(), SystemName.all());
+ super(controller, duration);
this.applications = controller.applications();
this.nodeRepository = controller.serviceRegistry().configServer().nodeRepository();
}
@@ -44,7 +43,7 @@ public class TrafficShareUpdater extends ControllerMaintainer {
for (var instance : application.instances().values()) {
for (var deployment : instance.deployments().values()) {
if ( ! deployment.zone().environment().isProduction()) continue;
-
+ if (shuttingDown()) return 1.0;
try {
attempts++;
updateTrafficFraction(instance, deployment);