From c06edbb297dc4cc02e92a8becda7ad7c94d15160 Mon Sep 17 00:00:00 2001 From: Ola Aunrønning Date: Fri, 8 Nov 2019 11:27:57 +0100 Subject: Use requested resources when finding allocation failures --- .../com/yahoo/vespa/hosted/provision/maintenance/CapacityChecker.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'node-repository') 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; } -- cgit v1.2.3