Don't consider retiring or failing hosts as valid replacement candidates

1 files changed, 2 insertions, 0 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
index 26a0315809b..e7e1e371047 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java
@@ -187,6 +187,8 @@ public class CapacityChecker {
         var resourceMap = new HashMap<>(availableResources);
         List<Node> validAllocationTargets = allHosts.stream()
                                                     .filter(h -> !hostsToRemove.contains(h))
+                                                    .filter(host -> !host.status().wantToRetire() &&
+                                                            !host.status().wantToFail())
                                                     .collect(Collectors.toList());
         if (validAllocationTargets.size() == 0)
             return Optional.of(HostRemovalFailure.none());