Only remove unused CNAMEs when removing obsolete policies

1 files changed, 9 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RoutingPolicies.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RoutingPolicies.java
index 59394b955b8..a82479fd0d8 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RoutingPolicies.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RoutingPolicies.java
@@ -153,10 +153,17 @@ public class RoutingPolicies {
             LOGGER.log(LogLevel.WARNING, "Removing " + removalCandidates + ". Active load balancers " +
                                          activeLoadBalancers);
         }
+        removalCandidates.forEach(allPolicies::remove);
+
+        // Find CNAMEs in use
+        var cnamesUsed = allPolicies.stream()
+                .map(policy -> policy.endpointIn(controller.system()).dnsName())
+                .collect(Collectors.toSet());
+
         for (var policy : removalCandidates) {
             var dnsName = policy.endpointIn(controller.system()).dnsName();
-            controller.nameServiceForwarder().removeRecords(Record.Type.CNAME, RecordName.from(dnsName), Priority.normal);
-            allPolicies.remove(policy);
+            if ( ! cnamesUsed.contains(dnsName))
+                controller.nameServiceForwarder().removeRecords(Record.Type.CNAME, RecordName.from(dnsName), Priority.normal);
         }
         db.writeRoutingPolicies(loadBalancers.application, allPolicies);
     }