Handle removal of endpoints with duplicated IDs across scopes (#27099)

3 files changed, 9 insertions, 9 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 fa8851c414d..c76616c6d2c 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
@@ -256,7 +256,7 @@ public class RoutingController {
         EndpointList endpoints = declaredEndpointsOf(application.get()).targets(deployment);
         EndpointList globalEndpoints = endpoints.scope(Endpoint.Scope.global);
         for (var assignedRotation : instance.rotations()) {
-            EndpointList rotationEndpoints = globalEndpoints.named(assignedRotation.endpointId())
+            EndpointList rotationEndpoints = globalEndpoints.named(assignedRotation.endpointId(), Scope.global)
                                                             .requiresRotation();
 
             // Skip rotations which do not apply to this zone. Legacy names always point to all zones
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointList.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointList.java
index 7fe8d554998..3da9065b52d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointList.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointList.java
@@ -32,9 +32,10 @@ public class EndpointList extends AbstractFilteringList<Endpoint, EndpointList>
         return not().legacy().asList().stream().findFirst();
     }
 
-    /** Returns the subset of endpoints named according to given ID */
-    public EndpointList named(EndpointId id) {
-        return matching(endpoint -> endpoint.name().equals(id.id()));
+    /** Returns the subset of endpoints named according to given ID and scope */
+    public EndpointList named(EndpointId id, Endpoint.Scope scope) {
+        return matching(endpoint -> endpoint.scope() == scope && // ID is only unique within a scope
+                                    endpoint.name().equals(id.id()));
     }
 
     /** Returns the subset of endpoints pointing to given cluster */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
index 637393d71cb..59f886bdea6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/routing/RoutingPolicies.java
@@ -170,7 +170,7 @@ public class RoutingPolicies {
         for (Map.Entry<RoutingId, List<RoutingPolicy>> routeEntry : routingTable.entrySet()) {
             RoutingId routingId = routeEntry.getKey();
             controller.routing().readDeclaredEndpointsOf(routingId.instance())
-                      .named(routingId.endpointId())
+                      .named(routingId.endpointId(), Endpoint.Scope.global)
                       .not().requiresRotation()
                       .forEach(endpoint -> updateGlobalDnsOf(endpoint, inactiveZones, routeEntry.getValue(), owner));
         }
@@ -269,8 +269,7 @@ public class RoutingPolicies {
         for (Map.Entry<RoutingId, List<RoutingPolicy>> routeEntry : routingTable.entrySet()) {
             RoutingId routingId = routeEntry.getKey();
             EndpointList endpoints = controller.routing().declaredEndpointsOf(application)
-                                               .scope(Endpoint.Scope.application)
-                                               .named(routingId.endpointId());
+                                               .named(routingId.endpointId(), Endpoint.Scope.application);
             for (Endpoint endpoint : endpoints) {
                 for (var policy : routeEntry.getValue()) {
                     for (var target : endpoint.targets()) {
@@ -471,7 +470,7 @@ public class RoutingPolicies {
         for (var id : removalCandidates) {
             EndpointList endpoints = controller.routing().readDeclaredEndpointsOf(id.instance())
                                                .not().requiresRotation()
-                                               .named(id.endpointId());
+                                               .named(id.endpointId(), Endpoint.Scope.global);
             NameServiceForwarder forwarder = nameServiceForwarderIn(allocation.deployment.zoneId());
             // This removes all ALIAS records having this DNS name. There is no attempt to delete only the entry for the
             // affected zone. Instead, the correct set of records is (re)created by updateGlobalDnsOf
@@ -491,7 +490,7 @@ public class RoutingPolicies {
             TenantAndApplicationId application = TenantAndApplicationId.from(id.instance());
             EndpointList endpoints = controller.routing()
                                                .readDeclaredEndpointsOf(application)
-                                               .named(id.endpointId());
+                                               .named(id.endpointId(), Endpoint.Scope.application);
             List<RoutingPolicy> policies = routingTable.get(id);
             for (var policy : policies) {
                 if (!policy.appliesTo(allocation.deployment)) continue;