Never clear switch hostname

2 files changed, 11 insertions, 3 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 35b1407441e..f9be94c4119 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
@@ -37,7 +37,7 @@ public class HostSwitchUpdater extends ControllerMaintainer {
                 if (!shouldUpdate(node, nodeEntity)) continue;
 
                 NodeRepositoryNode updatedNode = new NodeRepositoryNode();
-                updatedNode.setSwitchHostname(nodeEntity.switchHostname().orElse(null));
+                updatedNode.setSwitchHostname(nodeEntity.switchHostname().get());
                 nodeRepository.patchNode(zone, node.hostname().value(), updatedNode);
             }
         }
@@ -46,6 +46,7 @@ public class HostSwitchUpdater extends ControllerMaintainer {
 
     private static boolean shouldUpdate(Node node, NodeEntity nodeEntity) {
         if (nodeEntity == null) return false;
+        if (nodeEntity.switchHostname().isEmpty()) return false;
         return !node.switchHostname().equals(nodeEntity.switchHostname());
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/HostSwitchUpdaterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/HostSwitchUpdaterTest.java
index 1688141fe2d..d87eb69b6f7 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/HostSwitchUpdaterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/HostSwitchUpdaterTest.java
@@ -9,6 +9,7 @@ import org.junit.Test;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Supplier;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -50,8 +51,14 @@ public class HostSwitchUpdaterTest {
         // Host is updated
         tester.serviceRegistry().configServer().nodeRepository().allowPatching(true);
         maintainer.maintain();
-        Node updatedHost = allNodes(tester).stream().filter(node -> node.hostname().equals(host.hostname())).findFirst().get();
-        assertEquals(newSwitch, updatedHost.switchHostname().get());
+        Supplier<Node> updatedHost = () -> allNodes(tester).stream().filter(node -> node.hostname().equals(host.hostname())).findFirst().get();
+        assertEquals(newSwitch, updatedHost.get().switchHostname().get());
+
+        // Host keeps old switch hostname if removed from the node entity
+        nodeEntity = new NodeEntity(host.hostname().value(), "", "", "");
+        tester.serviceRegistry().entityService().addNodeEntity(nodeEntity);
+        maintainer.maintain();
+        assertEquals(newSwitch, updatedHost.get().switchHostname().get());
     }
 
     private static List<Node> allNodes(ControllerTester tester) {