Avoid logging if there are no records to remove

1 files changed, 6 insertions, 3 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DnsMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DnsMaintainer.java
index 4dca8bc2811..2fe6af02480 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DnsMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/DnsMaintainer.java
@@ -47,16 +47,19 @@ public class DnsMaintainer extends Maintainer {
     protected void maintain() {
         try (RotationLock lock = rotationRepository().lock()) {
             Map<RotationId, Rotation> unassignedRotations = rotationRepository().availableRotations(lock);
-            rotationToCheckOf(unassignedRotations.values()).ifPresent(this::removeDnsAlias);
+            rotationToCheckOf(unassignedRotations.values()).ifPresent(this::removeCname);
         }
     }
 
-    /** Remove DNS alias for unassigned rotation */
-    private void removeDnsAlias(Rotation rotation) {
+    /** Remove CNAME(s) for unassigned rotation */
+    private void removeCname(Rotation rotation) {
         // When looking up CNAME by data, the data must be a FQDN
         List<Record> records = nameService.findRecords(Record.Type.CNAME, RecordData.fqdn(rotation.name())).stream()
                                           .filter(DnsMaintainer::canUpdate)
                                           .collect(Collectors.toList());
+        if (records.isEmpty()) {
+            return;
+        }
         log.info(String.format("Removing DNS records %s because they point to the unassigned " +
                                "rotation %s (%s)", records, rotation.id().asString(), rotation.name()));
         nameService.removeRecords(records);