diff options
| author | Jon Bratseth <bratseth@oath.com> | 2021-04-14 14:09:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-14 14:09:01 +0200 |
| commit | acc1a51015dc24ad3de9e99c9c067d49a517b8c1 (patch) | |
| tree | 9c2e62b477bdaba76c5a615285313a008a045b2b /node-repository | |
| parent | 8ed6273fd8458eb36da7d75413437e6b63ae5aac (diff) | |
| parent | b55d29233e604e91158fdf00e9604f82b6ac4613 (diff) | |
Merge pull request #17387 from vespa-engine/bratseth/reserved-as-spares
Don't use reserved nodes as spares
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacity.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacity.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacity.java index 0e0211beea7..58a7aa2b189 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacity.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostCapacity.java @@ -45,6 +45,7 @@ public class HostCapacity { return candidates.stream() .filter(node -> node.type().canRun(NodeType.tenant)) .filter(host -> host.state() == Node.State.active) + .filter(host -> host.reservedTo().isEmpty()) .filter(host -> freeIps(host) > 0) .sorted(this::compareWithoutInactive) .limit(count) @@ -55,6 +56,7 @@ public class HostCapacity { return candidates.stream() .filter(node -> node.type() == NodeType.host) .filter(host -> host.state() == Node.State.active) + .filter(host -> host.reservedTo().isEmpty()) .filter(host -> allNodes.childrenOf(host).isEmpty()) .collect(Collectors.toSet()); } |