Merge pull request #18444 from vespa-engine/mpolden/check-shutdown

Return from slow loop when shutting down

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);