diff options
| author | Håkon Hallingstad <hakon.hallingstad@gmail.com> | 2020-04-30 16:02:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 16:02:53 +0200 |
| commit | a3be299e79cf0d00a4bdc79c93a30af2cb977901 (patch) | |
| tree | 5d9c31755f4eefebce6dd41c31a7bf3bcb52db61 /config-provisioning | |
| parent | 48ff6fe2efd6901796a9b8a0ceb8161232bcea15 (diff) | |
Revert "Bratseth/allow non allocatable limits"
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, 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. * |