diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-11-18 18:51:52 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-11-18 18:51:52 +0100 |
commit | 40ddafbd211ebf7e59346f731de37b72e35530d6 (patch) | |
tree | 48bd35930e853ebd91285ff0c15b932187347e09 /config-provisioning | |
parent | 2872e68c64605c04147fbf930d76f09078ce5550 (diff) |
Use the overhead of the exactly matching flavors if any
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java | 2 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java index 22c9234b0c5..dd07b29c2de 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java @@ -31,7 +31,7 @@ public final class ClusterSpec { this.type = type; this.id = id; this.groupId = groupId; - this.vespaVersion = Objects.requireNonNull(vespaVersion); + this.vespaVersion = Objects.requireNonNull(vespaVersion, "vespaVersion cannot be null"); this.exclusive = exclusive; if (type == Type.combined) { if (combinedId.isEmpty()) throw new IllegalArgumentException("combinedId must be set for cluster of type " + type); 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 836bf5f72d0..99f764c5a1b 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 @@ -393,7 +393,7 @@ public class NodeResources { public boolean compatibleWith(NodeResources requested) { if ( ! equal(this.vcpu, requested.vcpu)) return false; if ( ! equal(this.memoryGb, requested.memoryGb)) return false; - if (requested.storageType == StorageType.local) { + if (this.storageType == StorageType.local || requested.storageType == StorageType.local) { if ( ! equal(this.diskGb, requested.diskGb)) return false; } else { |