diff options
author | jonmv <venstad@gmail.com> | 2023-06-01 16:24:25 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-06-01 16:24:25 +0200 |
commit | cdbaa17019be02605888af51e211972fde096a8b (patch) | |
tree | 3e22697f2ed6edbbd473561aa72a1601a9a3296d /node-repository | |
parent | 4cae2ecf6c9c5ac7f329a112451909d0f7ac3950 (diff) |
Compare advertised resrouces to candidate node
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodePrioritizer.java | 4 |
1 files changed, 3 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 1d4ab5fc09c..4f21c8dcd50 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 @@ -32,6 +32,7 @@ public class NodePrioritizer { private final List<NodeCandidate> candidates = new ArrayList<>(); private final LockedNodeList allNodes; private final HostCapacity capacity; + private final HostResourcesCalculator calculator; private final NodeSpec requestedNodes; private final ApplicationId application; private final ClusterSpec clusterSpec; @@ -48,6 +49,7 @@ public class NodePrioritizer { int wantedGroups, boolean dynamicProvisioning, NameResolver nameResolver, Nodes nodes, HostResourcesCalculator hostResourcesCalculator, int spareCount, boolean enclave) { this.allNodes = allNodes; + this.calculator = hostResourcesCalculator; this.capacity = new HostCapacity(this.allNodes, hostResourcesCalculator); this.requestedNodes = nodeSpec; this.clusterSpec = clusterSpec; @@ -155,7 +157,7 @@ public class NodePrioritizer { } private boolean fitsPerfectly(Node host) { - return host.resources().compatibleWith(requestedNodes.resources().get()); + return calculator.advertisedResourcesOf(host.flavor()).compatibleWith(requestedNodes.resources().get()); } /** Add existing nodes allocated to the application */ |