diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-05-02 10:49:56 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-05-02 10:49:56 +0200 |
| commit | ec9d641119a6d41656c3902ed375702628ef5c9f (patch) | |
| tree | fc1ea9b6c24ff127a9022df06614d3452600d657 /config-provisioning | |
| parent | 7c0f9bb894b037c9dcd577cf74e4c5e216530d9c (diff) | |
Revert "Merge pull request #13131 from vespa-engine/revert-13128-bratseth/allow-non-allocatable-limits-take-2"
This reverts commit 78d7d808067a9189960f3cc2ad83237ba00efec5, reversing
changes made to e1d09983f5e952f44358ae5b247e5b76b2898d82.
Diffstat (limited to 'config-provisioning')
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java | 2 | ||||
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java index 11ae0845fb0..9aaf0d365cd 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java @@ -37,6 +37,8 @@ public class ClusterResources { public boolean smallerThan(ClusterResources other) { if (this.nodes < other.nodes) return true; if (this.groups < other.groups) return true; + if (this.nodeResources.isUnspecified() || other.nodeResources.isUnspecified()) return false; + if ( ! this.nodeResources.justNumbers().satisfies(other.nodeResources.justNumbers())) return true; return false; } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java index 05b604b263f..bed36d0d5d2 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java @@ -241,6 +241,8 @@ public class NodeResources { return true; } + public boolean isUnspecified() { return this == unspecified; } + /** * Create this from serial form. * |