Avoid changing allocation when switching to combined cluster type

1 files changed, 9 insertions, 8 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 84b344791c8..f1a8b579866 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
@@ -85,14 +85,15 @@ public final class ClusterSpec {
         return true;
     }
 
-    /** Returns whether this is equal, disregarding the group value and wanted Vespa version */
-    public boolean equalsIgnoringGroupAndVespaVersion(Object o) {
-        if (o == this) return true;
-        if ( ! (o instanceof ClusterSpec)) return false;
-        ClusterSpec other = (ClusterSpec)o;
-        if ( ! other.type.equals(this.type)) return false;
-        if ( ! other.id.equals(this.id)) return false;
-        return true;
+    /**
+     * Returns whether this satisfies other for allocation purposes. Only considers cluster ID and type, other fields
+     * are ignored.
+     */
+    public boolean satisfies(ClusterSpec other) {
+        if ( ! other.id.equals(this.id)) return false; // ID mismatch
+        // TODO(mpolden): Remove this after January 2019, once all nodes in combined clusters have type combined.
+        if (other.type.isContent() || this.type.isContent()) return other.type.isContent() == this.type.isContent();
+        return other.type.equals(this.type);
     }
 
     /** A cluster type */