diff options
Diffstat (limited to 'controller-server/src')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index c2dbc8bdc59..79bc72f950d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -482,16 +482,19 @@ public class ApplicationController { /** Register a DNS name for rotation */ private void registerRotationInDns(Rotation rotation, String dnsName) { try { - Optional<Record> record = nameService.findRecord(Record.Type.CNAME, RecordName.from(dnsName)); + RecordData rotationName = RecordData.fqdn(rotation.name()); - if (record.isPresent()) { + List<Record> records = nameService.findRecords(Record.Type.CNAME, RecordName.from(dnsName)); + records.forEach(record -> { // Ensure that the existing record points to the correct rotation - if ( ! record.get().data().equals(rotationName)) { - nameService.updateRecord(record.get().id(), rotationName); - log.info("Updated mapping for record ID " + record.get().id().asString() + ": '" + dnsName - + "' -> '" + rotation.name() + "'"); + if ( ! record.data().equals(rotationName)) { + nameService.updateRecord(record.id(), rotationName); + log.info("Updated mapping for record ID " + record.id().asString() + ": '" + dnsName + + "' -> '" + rotation.name() + "'"); } - } else { + }); + + if (records.isEmpty()) { RecordId id = nameService.createCname(RecordName.from(dnsName), rotationName); log.info("Registered mapping with record ID " + id.asString() + ": '" + dnsName + "' -> '" + rotation.name() + "'"); |