Remove change-routing-status-of-all-upstreams flag

2 files changed, 2 insertions, 49 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
index c58bb0e5fab..943d6ac7b18 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java
@@ -74,7 +74,6 @@ public class RoutingController {
     private final RoutingPolicies routingPolicies;
     private final RotationRepository rotationRepository;
     private final BooleanFlag hideSharedRoutingEndpoint;
-    private final BooleanFlag changeRoutingStatusOfAllUpstreams;
 
     public RoutingController(Controller controller, RotationsConfig rotationsConfig) {
         this.controller = Objects.requireNonNull(controller, "controller must be non-null");
@@ -83,7 +82,6 @@ public class RoutingController {
                                                          controller.applications(),
                                                          controller.curator());
         this.hideSharedRoutingEndpoint = Flags.HIDE_SHARED_ROUTING_ENDPOINT.bindTo(controller.flagSource());
-        this.changeRoutingStatusOfAllUpstreams = Flags.CHANGE_ROUTING_STATUS_OF_ALL_UPSTREAMS.bindTo(controller.flagSource());
     }
 
     /** Create a routing context for given deployment */
@@ -92,8 +90,7 @@ public class RoutingController {
             return new SharedDeploymentRoutingContext(deployment,
                                                       this,
                                                       controller.serviceRegistry().configServer(),
-                                                      controller.clock(),
-                                                      changeRoutingStatusOfAllUpstreams.value());
+                                                      controller.clock());
         }
         return new ExclusiveDeploymentRoutingContext(deployment, this);
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java
index 3124d836e54..e5eb1382ccf 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/context/DeploymentRoutingContext.java
@@ -72,21 +72,15 @@ public abstract class DeploymentRoutingContext implements RoutingContext {
 
         private final Clock clock;
         private final ConfigServer configServer;
-        private final boolean changeAllUpstreams;
 
-        public SharedDeploymentRoutingContext(DeploymentId deployment, RoutingController controller, ConfigServer configServer, Clock clock, boolean changeAllUpstreams) {
+        public SharedDeploymentRoutingContext(DeploymentId deployment, RoutingController controller, ConfigServer configServer, Clock clock) {
             super(deployment, RoutingMethod.shared, controller);
             this.clock = Objects.requireNonNull(clock);
             this.configServer = Objects.requireNonNull(configServer);
-            this.changeAllUpstreams = changeAllUpstreams;
         }
 
         @Override
         public void setRoutingStatus(RoutingStatus.Value value, RoutingStatus.Agent agent) {
-            if (!changeAllUpstreams) {
-                setLegacyRoutingStatus(value, agent);
-                return;
-            }
             EndpointStatus newStatus = new EndpointStatus(value == RoutingStatus.Value.in
                                                                   ? EndpointStatus.Status.in
                                                                   : EndpointStatus.Status.out,
@@ -101,10 +95,6 @@ public abstract class DeploymentRoutingContext implements RoutingContext {
 
         @Override
         public RoutingStatus routingStatus() {
-            if (!changeAllUpstreams) {
-                return legacyRoutingStatus();
-            }
-
             // In a given deployment, all upstreams (clusters) share the same status, so we can query using any
             // upstream name
             String upstreamName = upstreamNames().get(0);
@@ -136,40 +126,6 @@ public abstract class DeploymentRoutingContext implements RoutingContext {
             return upstreamNames;
         }
 
-        private void setLegacyRoutingStatus(RoutingStatus.Value value, RoutingStatus.Agent agent) {
-            EndpointStatus newStatus = new EndpointStatus(value == RoutingStatus.Value.in
-                                                                  ? EndpointStatus.Status.in
-                                                                  : EndpointStatus.Status.out,
-                                                          agent.name(),
-                                                          clock.instant());
-            primaryEndpoint().ifPresent(endpoint -> {
-                try {
-                    configServer.setGlobalRotationStatus(deployment, List.of(endpoint.upstreamName(deployment)), newStatus);
-                } catch (Exception e) {
-                    throw new RuntimeException("Failed to set rotation status of " + endpoint + " in " + deployment, e);
-                }
-            });
-        }
-
-        private RoutingStatus legacyRoutingStatus() {
-            Optional<EndpointStatus> status = primaryEndpoint().map(endpoint -> {
-                var upstreamName = endpoint.upstreamName(deployment);
-                return configServer.getGlobalRotationStatus(deployment, upstreamName);
-            });
-            if (status.isEmpty()) return RoutingStatus.DEFAULT;
-            RoutingStatus.Agent agent;
-            try {
-                agent = RoutingStatus.Agent.valueOf(status.get().agent().toLowerCase());
-            } catch (IllegalArgumentException e) {
-                agent = RoutingStatus.Agent.unknown;
-            }
-            return new RoutingStatus(status.get().status() == EndpointStatus.Status.in
-                                             ? RoutingStatus.Value.in
-                                             : RoutingStatus.Value.out,
-                                     agent,
-                                     status.get().changedAt());
-        }
-
         private Optional<Endpoint> primaryEndpoint() {
             return controller.readDeclaredEndpointsOf(deployment.applicationId())
                              .requiresRotation()