Merge pull request #11249 from vespa-engine/olaa/use-requested-resources-for-allocation-failures

Use requested resources when finding allocation failures

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;       }