Merge pull request #12150 from vespa-engine/mpolden/status-change-safeguard

Never remove all members from global endpoints

1 files changed, 12 insertions, 2 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java
index 680613e8065..b54446c071e 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java
@@ -45,7 +45,7 @@ public class MemoryNameService implements NameService {
                              .map(target -> new Record(Record.Type.ALIAS, name, target.asData()))
                              .collect(Collectors.toList());
         // Satisfy idempotency contract of interface
-        removeRecords(findRecords(Record.Type.ALIAS, name));
+        removeRecords(records);
         records.forEach(this::add);
         return records;
     }
@@ -74,7 +74,17 @@ public class MemoryNameService implements NameService {
                                                "the FQDN name");
         }
         return records.stream()
-                      .filter(record -> record.type() == type && record.data().equals(data))
+                      .filter(record -> {
+                          if (record.type() == type) {
+                              if (type == Record.Type.ALIAS) {
+                                  // Unpack ALIAS record and compare FQDN of data part
+                                  return RecordData.fqdn(AliasTarget.from(record.data()).name().value())
+                                                   .equals(data);
+                              }
+                              return record.data().equals(data);
+                          }
+                          return false;
+                      })
                       .collect(Collectors.toUnmodifiableList());
     }