diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-05-01 18:29:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-01 18:29:44 +0200 |
commit | e2f2805e54df66192001384c120357b742e331e8 (patch) | |
tree | dfd13f17c5749ac9dfe7e6c5c71ab70d83aa12d1 /config-provisioning/src | |
parent | e1d09983f5e952f44358ae5b247e5b76b2898d82 (diff) |
Revert "Bratseth/allow non allocatable limits take 2"
Diffstat (limited to 'config-provisioning/src')
-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, 0 insertions, 4 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 9aaf0d365cd..11ae0845fb0 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,8 +37,6 @@ 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 bed36d0d5d2..05b604b263f 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,8 +241,6 @@ public class NodeResources { return true; } - public boolean isUnspecified() { return this == unspecified; } - /** * Create this from serial form. * |