Merge pull request #24929 from vespa-engine/bratseth/exclusive-exact-match

Use the overhead of the exactly matching flavors if any

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 e03ebb4d8da..d9a723d69f1 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
@@ -399,7 +399,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 {