diff options
| author | Jon Bratseth <bratseth@vespa.ai> | 2023-06-05 14:15:48 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@vespa.ai> | 2023-06-05 14:15:48 +0200 |
| commit | 310ed151ea7b3c1a114f496a9264ca8915bf5619 (patch) | |
| tree | c9dba5c5bd644d2d39a4e443530a0b1cbe29d2b1 /node-repository | |
| parent | 8226d4766007f0091826044c126655f388522a43 (diff) | |
Only validate specified values
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java index 4d33e1c7bad..9ded1a2735c 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java @@ -27,13 +27,11 @@ public class NodeResourceLimits { /** Validates the resources applications ask for (which are in "advertised" resource space) */ public void ensureWithinAdvertisedLimits(String type, NodeResources requested, ApplicationId applicationId, ClusterSpec cluster) { - if (requested.isUnspecified()) return; - - if (requested.vcpu() < minAdvertisedVcpu(applicationId, cluster)) + if (! requested.vcpuIsUnspecified() && requested.vcpu() < minAdvertisedVcpu(applicationId, cluster)) illegal(type, "vcpu", "", cluster, requested.vcpu(), minAdvertisedVcpu(applicationId, cluster)); - if (requested.memoryGb() < minAdvertisedMemoryGb(cluster)) + if (! requested.memoryGbIsUnspecified() && requested.memoryGb() < minAdvertisedMemoryGb(cluster)) illegal(type, "memoryGb", "Gb", cluster, requested.memoryGb(), minAdvertisedMemoryGb(cluster)); - if (requested.diskGb() < minAdvertisedDiskGb(requested, cluster.isExclusive())) + if (! requested.diskGbIsUnspecified() && requested.diskGb() < minAdvertisedDiskGb(requested, cluster.isExclusive())) illegal(type, "diskGb", "Gb", cluster, requested.diskGb(), minAdvertisedDiskGb(requested, cluster.isExclusive())); } |