Ensure unique NodeAgent ID for reallocations

1 files changed, 11 insertions, 1 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
index 8c8f3d88a71..36668158dd6 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeadmin/NodeAdminImpl.java
@@ -79,7 +79,7 @@ public class NodeAdminImpl implements NodeAdmin {
     @Override
     public void refreshContainersToRun(Set<NodeAgentContext> nodeAgentContexts) {
         Map<String, NodeAgentContext> nodeAgentContextsByHostname = nodeAgentContexts.stream()
-                .collect(Collectors.toMap(nac -> nac.hostname().value(), Function.identity()));
+                .collect(Collectors.toMap(NodeAdminImpl::nodeAgentId, Function.identity()));
 
         // Stop and remove NodeAgents that should no longer be running
         diff(nodeAgentWithSchedulerByHostname.keySet(), nodeAgentContextsByHostname.keySet())
@@ -222,4 +222,14 @@ public class NodeAdminImpl implements NodeAdmin {
         NodeAgent nodeAgent = nodeAgentFactory.create(contextManager, context);
         return new NodeAgentWithScheduler(nodeAgent, contextManager);
     }
+
+    private static String nodeAgentId(NodeAgentContext nac) {
+        // NodeAgentImpl has some internal state that should not be reused when the same hostname is re-allocated
+        // to a different application/cluster, solve this by including reservation timestamp in the key.
+        return nac.hostname().value() + "-" + nac.node().events().stream()
+                .filter(event -> "reserved".equals(event.type()))
+                .findFirst()
+                .map(event -> Long.toString(event.at().toEpochMilli()))
+                .orElse("");
+    }
 }