diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-07-12 09:41:07 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2022-07-12 09:41:07 +0200 |
commit | 3e4ec608f84cdb73b394b4d468e5d575016b51d7 (patch) | |
tree | 6751769679647cfa3a5dde23045565a0b7ff33e6 /node-repository/src/main/java/com/yahoo | |
parent | e65c9d4cc7d4950f309b50b8d5443e97188d6321 (diff) |
Reapply "Allow deprovision of parked host & node w/alloc when node has wantToDeprovision"
This reverts commit d097cb3bf2808bb05f2dc4fc2e7cf771246ba1a9.
Diffstat (limited to 'node-repository/src/main/java/com/yahoo')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java index 368a8da0f90..cdc4416f90b 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java @@ -198,7 +198,7 @@ public class DynamicProvisioningMaintainer extends NodeRepositoryMaintainer { .collect(Collectors.toMap(Node::hostname, Function.identity()))); nodes.stream() - .filter(node -> node.allocation().isPresent()) + .filter(node -> node.allocation().isPresent() && !node.status().wantToDeprovision()) .flatMap(node -> node.parentHostname().stream()) .distinct() .forEach(hostsByHostname::remove); |