1 files changed, 35 insertions, 9 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/HostSwitchUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/HostSwitchUpdater.java
index f9be94c4119..4065645ee57 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/HostSwitchUpdater.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/HostSwitchUpdater.java
@@ -1,15 +1,21 @@
 // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.maintenance;
 
+import com.yahoo.config.provision.SystemName;
 import com.yahoo.vespa.hosted.controller.Controller;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.Node;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepository;
+import com.yahoo.vespa.hosted.controller.api.integration.entity.EntityService;
 import com.yahoo.vespa.hosted.controller.api.integration.entity.NodeEntity;
 import com.yahoo.vespa.hosted.controller.api.integration.noderepository.NodeRepositoryNode;
 
 import java.time.Duration;
+import java.util.EnumSet;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -19,10 +25,13 @@ import java.util.stream.Collectors;
  */
 public class HostSwitchUpdater extends ControllerMaintainer {
 
+    private static final Logger LOG = Logger.getLogger(HostSwitchUpdater.class.getName());
+    private static final Pattern HOST_PATTERN = Pattern.compile("^(proxy|cfg|controller)host(.+)$");
+
     private final NodeRepository nodeRepository;
 
     public HostSwitchUpdater(Controller controller, Duration interval) {
-        super(controller, interval);
+        super(controller, interval, null, EnumSet.of(SystemName.cd, SystemName.main));
         this.nodeRepository = controller.serviceRegistry().configServer().nodeRepository();
     }
 
@@ -31,19 +40,36 @@ public class HostSwitchUpdater extends ControllerMaintainer {
         Map<String, NodeEntity> nodeEntities = controller().serviceRegistry().entityService().listNodes().stream()
                                                            .collect(Collectors.toMap(NodeEntity::hostname,
                                                                                      Function.identity()));
-        for (var zone : controller().zoneRegistry().zones().controllerUpgraded().all().ids()) {
-            for (var node : nodeRepository.list(zone)) {
-                NodeEntity nodeEntity = nodeEntities.get(node.hostname().value());
-                if (!shouldUpdate(node, nodeEntity)) continue;
-
-                NodeRepositoryNode updatedNode = new NodeRepositoryNode();
-                updatedNode.setSwitchHostname(nodeEntity.switchHostname().get());
-                nodeRepository.patchNode(zone, node.hostname().value(), updatedNode);
+        int nodesUpdated = 0;
+        try {
+            for (var zone : controller().zoneRegistry().zones().controllerUpgraded().all().ids()) {
+                for (var node : nodeRepository.list(zone)) {
+                    NodeEntity nodeEntity = nodeEntities.get(registeredHostnameOf(node));
+                    if (!shouldUpdate(node, nodeEntity)) continue;
+
+                    NodeRepositoryNode updatedNode = new NodeRepositoryNode();
+                    updatedNode.setSwitchHostname(nodeEntity.switchHostname().get());
+                    nodeRepository.patchNode(zone, node.hostname().value(), updatedNode);
+                    nodesUpdated++;
+                }
+            }
+        } finally {
+            if (nodesUpdated > 0) {
+                LOG.info("Updated switch hostname for " + nodesUpdated + " node(s)");
             }
         }
         return true;
     }
 
+    /** Returns the hostname that given host is registered under in the {@link EntityService} */
+    private static String registeredHostnameOf(Node host) {
+        String hostname = host.hostname().value();
+        if (!host.type().isHost()) return hostname;
+        Matcher matcher = HOST_PATTERN.matcher(hostname);
+        if (!matcher.matches()) return hostname;
+        return matcher.replaceFirst("$1$2");
+    }
+
     private static boolean shouldUpdate(Node node, NodeEntity nodeEntity) {
         if (nodeEntity == null) return false;
         if (nodeEntity.switchHostname().isEmpty()) return false;