summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2021-02-24 20:32:25 +0100
committerValerij Fredriksen <valerijf@verizonmedia.com>2021-02-24 20:32:25 +0100
commit0a0771c53764a2fdf22a6272d2d83c1d9364708d (patch)
treea200ae9e705a864f59d02a190fdfedd27f98c5c4 /node-repository
parent3a2d89d9ec192e3c90d0814300d76c1d73170145 (diff)
Only check limits for tenant node allocations
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java4
1 files changed, 2 insertions, 2 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 6f323955ac7..0eb933a7dcc 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
@@ -6,8 +6,8 @@ import com.yahoo.config.provision.ClusterMembership;
import com.yahoo.config.provision.ClusterSpec;
import com.yahoo.config.provision.Flavor;
import com.yahoo.config.provision.NodeResources;
+import com.yahoo.config.provision.NodeType;
import com.yahoo.config.provision.SystemName;
-import com.yahoo.lang.MutableInteger;
import com.yahoo.vespa.hosted.provision.Node;
import com.yahoo.vespa.hosted.provision.NodeList;
import com.yahoo.vespa.hosted.provision.NodeRepository;
@@ -120,7 +120,7 @@ class NodeAllocation {
}
}
else if (! saturated() && hasCompatibleFlavor(candidate)) {
- if ( ! nodeResourceLimits.isWithinRealLimits(candidate, cluster)) {
+ if (requestedNodes.type() == NodeType.tenant && ! nodeResourceLimits.isWithinRealLimits(candidate, cluster)) {
++rejectedDueToInsufficientRealResources;
continue;
}