From 53260bc22f392143198ec142794e1fe0b55f5338 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Thu, 9 Dec 2021 22:50:10 +0100 Subject: Remove stray line and simplify --- .../src/main/java/com/yahoo/config/provision/ClusterResources.java | 7 ++----- .../src/main/java/com/yahoo/config/provision/NodeResources.java | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'config-provisioning') 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 66e03a9f5fa..9938823768b 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 @@ -48,11 +48,8 @@ public class ClusterResources { public boolean isWithin(ClusterResources min, ClusterResources max) { if (this.smallerThan(min)) return false; if (max.smallerThan(this)) return false; - if (min.nodeResources().isUnspecified()) - if ( ! min.nodeResources().isUnspecified() - && ! this.nodeResources.justNonNumbers().compatibleWith(min.nodeResources.justNonNumbers())) return false; - if ( ! max.nodeResources().isUnspecified() - && ! this.nodeResources.justNonNumbers().compatibleWith(max.nodeResources.justNonNumbers())) return false; + if ( ! this.nodeResources.justNonNumbers().compatibleWith(min.nodeResources.justNonNumbers())) return false; + if ( ! this.nodeResources.justNonNumbers().compatibleWith(max.nodeResources.justNonNumbers())) return false; return true; } 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 c753c22e3c6..5daaee4299e 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 @@ -282,8 +282,6 @@ public class NodeResources { /** Returns true if all the resources of this are the same as or compatible with the given resources */ public boolean compatibleWith(NodeResources other) { - ensureSpecified(); - other.ensureSpecified(); if ( ! equal(this.vcpu, other.vcpu)) return false; if ( ! equal(this.memoryGb, other.memoryGb)) return false; if ( ! equal(this.diskGb, other.diskGb)) return false; -- cgit v1.2.3