diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2019-11-08 11:27:57 +0100 |
---|---|---|
committer | Ola Aunrønning <olaa@verizonmedia.com> | 2019-11-08 11:27:57 +0100 |
commit | c06edbb297dc4cc02e92a8becda7ad7c94d15160 (patch) | |
tree | 26c141d61c4c26b66893857f0254e0b9e38cb751 /node-repository | |
parent | 5ccaab5e304bbedc2589610f12ea9fc83d1522ab (diff) |
Use requested resources when finding allocation failures
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java index 36f4c8759fd..83498aa8709 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java @@ -299,7 +299,9 @@ public class CapacityChecker { reason.violatesParentHostPolicy = violatesParentHostPolicy(node, host, containedAllocations); NodeResources l = availableHostResources.nodeResources; - NodeResources r = node.flavor().resources(); + NodeResources r = node.allocation() + .map(Allocation::requestedResources) + .orElse(node.flavor().resources()); if (l.vcpu() < r.vcpu()) { reason.insufficientVcpu = true; } if (l.memoryGb() < r.memoryGb()) { reason.insufficientMemoryGb = true; } if (l.diskGb() < r.diskGb()) { reason.insufficientDiskGb = true; } |