Allow retiring of host if all children are parked

1 files changed, 4 insertions, 2 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
index 6d82dfb7b4e..5a505710495 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirer.java
@@ -86,14 +86,16 @@ public class RetiredExpirer extends Maintainer {
 
     /**
      * Checks if the node can be removed:
-     * if the node is {@link NodeType#host}, it will only be removed if it has no children
+     * if the node is {@link NodeType#host}, it will only be removed if it has no children, or all its children are parked
      * Otherwise, a removal is allowed if either of these are true:
      * - The node has been in state {@link History.Event.Type#retired} for longer than {@link #retiredExpiry}
      * - Orchestrator allows it
      */
     private boolean canRemove(Node node) {
         if (node.type() == NodeType.host) {
-            return nodeRepository().getChildNodes(node.hostname()).isEmpty();
+            return nodeRepository()
+                    .getChildNodes(node.hostname()).stream()
+                    .allMatch(child -> child.state() == Node.State.parked);
         }
 
         Optional<Instant> timeOfRetiredEvent = node.history().event(History.Event.Type.retired).map(History.Event::at);