diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-05-14 09:04:38 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-05-14 09:04:38 +0200 |
commit | 7b332eae69e4f073f627c331e49353a147b3c9db (patch) | |
tree | 421424da82315fc0347266bc13307d579b0f3e85 /node-repository | |
parent | a1d3da1fc3f552ae4e289aba4b0daafa13192536 (diff) |
Deactivate resources verification
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java | 4 |
1 files changed, 3 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 0544b675a6f..ca9cbc418bb 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 @@ -113,7 +113,7 @@ class NodeAllocation { if (requestedNodes.considerRetiring()) { boolean wantToRetireNode = false; - if ( ! nodeResourceLimits.isWithinRealLimits(offered, cluster)) wantToRetireNode = true; + // if ( ! nodeResourceLimits.isWithinRealLimits(offered, cluster)) wantToRetireNode = true; if (violatesParentHostPolicy(this.nodes, offered)) wantToRetireNode = true; if ( ! hasCompatibleFlavor(node)) wantToRetireNode = true; if (offered.status().wantToRetire()) wantToRetireNode = true; @@ -127,10 +127,12 @@ class NodeAllocation { } } else if (! saturated() && hasCompatibleFlavor(node)) { + /* if ( ! nodeResourceLimits.isWithinRealLimits(offered, cluster)) { ++rejectedDueToInsufficientRealResources; continue; } + */ if ( violatesParentHostPolicy(this.nodes, offered)) { ++rejectedDueToClashingParentHost; continue; |