diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2021-03-18 13:28:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 13:28:05 +0100 |
| commit | 97cab75cbccc5bacbf0ad1fcb4795180801277cd (patch) | |
| tree | e61f1d2417489e544c6ddbb067ea20c87665db84 /node-repository | |
| parent | 7c5948aceceec2a3c279755622876932fdf5a3ed (diff) | |
| parent | bc9cd68f49b3d51c238b68a0115442dc64f1e7b9 (diff) | |
Merge pull request #17032 from vespa-engine/mpolden/non-tenant-real-limits
Non-tenant nodes are always within real limits
Diffstat (limited to 'node-repository')
2 files changed, 2 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java index 5f4af786c77..e014b50a25f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java @@ -123,7 +123,7 @@ class NodeAllocation { } } else if (! saturated() && hasCompatibleFlavor(candidate)) { - if (requestedNodes.type() == NodeType.tenant && ! nodeResourceLimits.isWithinRealLimits(candidate, cluster)) { + if (! nodeResourceLimits.isWithinRealLimits(candidate, cluster)) { ++rejectedDueToInsufficientRealResources; continue; } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java index ad03cafb4e3..4e74104c25b 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java @@ -39,6 +39,7 @@ public class NodeResourceLimits { /** Returns whether the real resources we'll end up with on a given tenant node are within limits */ public boolean isWithinRealLimits(NodeCandidate candidateNode, ClusterSpec cluster) { + if (candidateNode.type() != NodeType.tenant) return true; // Resource limits only apply to tenant nodes return isWithinRealLimits(nodeRepository.resourcesCalculator().realResourcesOf(candidateNode, nodeRepository, cluster.isExclusive()), cluster.type()); } |