aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-10-10 16:10:32 +0200
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-10-10 16:10:32 +0200
commitf3daabf4ce177ffb15b381175e1622607c8225e7 (patch)
tree01e28857e7950dccc2d2ed6a4f76853e94229b06 /node-repository
parent217cb2ee4ca2760388faa9c68be7fcf89422e87a (diff)
Move optimization up
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java3
1 files changed, 2 insertions, 1 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 c3d7f3ef6d7..5183a2d188f 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
@@ -116,6 +116,8 @@ public class NodePrioritizer {
* already have nodes allocated to this tenant
*/
void addNewDockerNodes(boolean exclusively) {
+ if ( ! isDocker) return;
+
LockedNodeList candidates = allNodes
.filter(node -> node.type() != NodeType.host || ALLOCATABLE_HOST_STATES.contains(node.state()));
@@ -135,7 +137,6 @@ public class NodePrioritizer {
}
private void addNewDockerNodesOn(LockedNodeList candidates) {
- if ( ! isDocker) return;
NodeResources wantedResources = resources(requestedNodes);
for (Node host : candidates) {