1 files changed, 3 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
index cdaaa870e5d..66fc07b51f2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java
@@ -574,7 +574,9 @@ public class Nodes {
             // This takes allocationLock to prevent any further allocation of nodes on this host
             host = lock.node();
             NodeList children = list(allocationLock).childrenOf(host);
-            result = retire(NodeListFilter.from(children.asList()), agent, instant);
+            result = performOn(NodeListFilter.from(children.asList()),
+                               (node, nodeLock) -> write(node.withWantToRetire(true, true, agent, instant),
+                                                         nodeLock));
             result.add(write(host.withWantToRetire(true, true, agent, instant), lock));
         }
         return result;