diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-09-29 18:55:45 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-09-29 18:55:45 +0200 |
| commit | 4a42076a45a2ec318577b4d12a52bb030f1fa99b (patch) | |
| tree | c0cbe413349197cb696575e115c0f5c9c65ec18e /node-repository | |
| parent | 152632c8aa7a850de899bc1feb18f5e35fde300d (diff) | |
Simplify
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java index 40a9d6ce083..817c358a4b0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java @@ -124,6 +124,7 @@ public class NodePrioritizer { private void addNewDockerNodesOn(LockedNodeList candidateHosts) { for (Node host : candidateHosts) { + if ( spareHosts.contains(host) && !isAllocatingForReplacement) continue; if ( ! capacity.hasCapacity(host, resources(requestedNodes))) continue; if ( ! allNodes.childrenOf(host).owner(application).cluster(clusterSpec.id()).isEmpty()) continue; @@ -145,16 +146,13 @@ public class NodePrioritizer { resources(requestedNodes).with(host.flavor().resources().diskSpeed()) .with(host.flavor().resources().storageType()), NodeType.tenant); - NodeCandidate candidate = NodeCandidate.createChild(newNode, - capacity.freeCapacityOf(host, false), - host, - spareHosts.contains(host), - false, - true, false); - if ( ! candidate.violatesSpares || isAllocatingForReplacement) { - log.log(Level.FINE, "Adding new Docker node " + newNode); - nodes.add(candidate); - } + nodes.add(NodeCandidate.createChild(newNode, + capacity.freeCapacityOf(host, false), + host, + spareHosts.contains(host), + false, + true, + false)); } } |