[7.16] Implement getMinimalSupportedVersion for all NameDiffs (#81374) (

#81424) * Implement getMinimalSupportedVersion for all NameDiffs (#81374) This removes the default implementation of `getMinimalSupportedVersion` and implements it in all `NameDiffs` implementations. The default implementation was rather broad, `minimumIndexCompatibilityVersion` as the index compatibility are wider than our wire compatibility. Having a default implementation also had the implementors forget about adjusting the wire compatibility to the correct version. (cherry picked from commit 5546d5a) Signed-off-by: Andrei Dan <andrei.dan@elastic.co> # Conflicts: # x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetadata.java # x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/TransformMetadata.java # x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/allocation/TrainedModelAllocationMetadata.java
elastic · Dec 7, 2021 · d26b202 · d26b202
1 parent d64e867
commit d26b202
Show file tree

Hide file tree

Showing 15 changed files with 72 additions and 6 deletions.
diff --git a/server/src/main/java/org/elasticsearch/cluster/NamedDiff.java b/server/src/main/java/org/elasticsearch/cluster/NamedDiff.java
@@ -18,8 +18,6 @@ public interface NamedDiff<T extends Diffable<T>> extends Diff<T>, NamedWriteabl
     /**
      * The minimal version of the recipient this custom object can be sent to
      */
-    default Version getMinimalSupportedVersion() {
-        return Version.CURRENT.minimumIndexCompatibilityVersion();
-    }
+    Version getMinimalSupportedVersion();
 
 }
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ComponentTemplateMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ComponentTemplateMetadata.java
@@ -164,5 +164,10 @@ public void writeTo(StreamOutput out) throws IOException {
         public String getWriteableName() {
             return TYPE;
         }
+
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return Version.V_7_7_0;
+        }
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateMetadata.java
@@ -165,5 +165,10 @@ public void writeTo(StreamOutput out) throws IOException {
         public String getWriteableName() {
             return TYPE;
         }
+
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return Version.V_7_7_0;
+        }
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamMetadata.java
@@ -215,5 +215,10 @@ public void writeTo(StreamOutput out) throws IOException {
         public String getWriteableName() {
             return TYPE;
         }
+
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return Version.V_7_7_0;
+        }
     }
 }
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexGraveyard.java
@@ -332,6 +332,11 @@ public int getRemovedCount() {
         public String getWriteableName() {
             return TYPE;
         }
+
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return Version.CURRENT.minimumCompatibilityVersion();
+        }
     }
 
     /**

diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/NodesShutdownMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/NodesShutdownMetadata.java
@@ -195,6 +195,12 @@ public void writeTo(StreamOutput out) throws IOException {
         static Diff<SingleNodeShutdownMetadata> readNodesDiffFrom(StreamInput in) throws IOException {
             return AbstractDiffable.readDiffFrom(SingleNodeShutdownMetadata::new, in);
         }
+
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return NODE_SHUTDOWN_VERSION;
+        }
+
     }
 
 }
diff --git a/server/src/main/java/org/elasticsearch/ingest/IngestMetadata.java b/server/src/main/java/org/elasticsearch/ingest/IngestMetadata.java
@@ -152,6 +152,11 @@ public void writeTo(StreamOutput out) throws IOException {
         public String getWriteableName() {
             return TYPE;
         }
+
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return Version.CURRENT.minimumCompatibilityVersion();
+        }
     }
 
     @Override

diff --git a/server/src/main/java/org/elasticsearch/script/ScriptMetadata.java b/server/src/main/java/org/elasticsearch/script/ScriptMetadata.java
@@ -125,6 +125,11 @@ public Metadata.Custom apply(Metadata.Custom part) {
         public void writeTo(StreamOutput out) throws IOException {
             pipelines.writeTo(out);
         }
+
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return Version.CURRENT.minimumCompatibilityVersion();
+        }
     }
 
     /**

diff --git a/server/src/main/java/org/elasticsearch/upgrades/FeatureMigrationResults.java b/server/src/main/java/org/elasticsearch/upgrades/FeatureMigrationResults.java
@@ -189,6 +189,12 @@ public void writeTo(StreamOutput out) throws IOException {
         static Diff<SingleFeatureMigrationResult> readDiffFrom(StreamInput in) throws IOException {
             return AbstractDiffable.readDiffFrom(SingleFeatureMigrationResult::new, in);
         }
+
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return MIGRATION_ADDED_VERSION;
+        }
+
     }
 
 }
diff --git a/...in/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/AutoscalingMetadata.java b/...in/autoscaling/src/main/java/org/elasticsearch/xpack/autoscaling/AutoscalingMetadata.java
@@ -166,6 +166,10 @@ static Diff<AutoscalingPolicyMetadata> readFrom(final StreamInput in) throws IOE
             return AbstractDiffable.readDiffFrom(AutoscalingPolicyMetadata::new, in);
         }
 
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return Version.V_7_8_0;
+        }
     }
 
 }
diff --git a/...ck/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleMetadata.java b/...ck/plugin/core/src/main/java/org/elasticsearch/xpack/core/ilm/IndexLifecycleMetadata.java
@@ -109,7 +109,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
     @Override
     public Version getMinimalSupportedVersion() {
-        return Version.V_6_6_0;
+        return Version.CURRENT.minimumCompatibilityVersion();
     }
 
     @Override
@@ -183,6 +183,11 @@ public String getWriteableName() {
             return TYPE;
         }
 
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return Version.CURRENT.minimumCompatibilityVersion();
+        }
+
         static Diff<LifecyclePolicyMetadata> readLifecyclePolicyDiffFrom(StreamInput in) throws IOException {
             return AbstractDiffable.readDiffFrom(LifecyclePolicyMetadata::new, in);
         }

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetadata.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/MlMetadata.java
@@ -130,7 +130,7 @@ public boolean isResetMode() {
 
     @Override
     public Version getMinimalSupportedVersion() {
-        return Version.V_6_0_0_alpha1;
+        return Version.CURRENT.minimumCompatibilityVersion();
     }
 
     @Override
@@ -287,6 +287,11 @@ public String getWriteableName() {
             return TYPE;
         }
 
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return Version.CURRENT.minimumCompatibilityVersion();
+        }
+
         static Diff<Job> readJobDiffFrom(StreamInput in) throws IOException {
             return AbstractDiffable.readDiffFrom(Job::new, in);
         }

diff --git a/...ugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/ModelAliasMetadata.java b/...ugin/core/src/main/java/org/elasticsearch/xpack/core/ml/inference/ModelAliasMetadata.java
@@ -162,6 +162,12 @@ public String getWriteableName() {
         public void writeTo(StreamOutput out) throws IOException {
             modelAliasesDiff.writeTo(out);
         }
+
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return Version.V_7_13_0;
+        }
+
     }
 
     public static class ModelAliasEntry extends AbstractDiffable<ModelAliasEntry> implements ToXContentObject {

diff --git a/...plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadata.java b/...plugin/core/src/main/java/org/elasticsearch/xpack/core/slm/SnapshotLifecycleMetadata.java
@@ -226,5 +226,11 @@ public void writeTo(StreamOutput out) throws IOException {
         static Diff<SnapshotLifecyclePolicyMetadata> readLifecyclePolicyDiffFrom(StreamInput in) throws IOException {
             return AbstractDiffable.readDiffFrom(SnapshotLifecyclePolicyMetadata::new, in);
         }
+
+        @Override
+        public Version getMinimalSupportedVersion() {
+            return Version.V_7_4_0;
+        }
+
     }
 }
diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleMetadataTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleMetadataTests.java
@@ -176,7 +176,7 @@ protected Reader<Diff<Custom>> diffReader() {
     }
 
     public void testMinimumSupportedVersion() {
-        assertEquals(Version.V_6_6_0, createTestInstance().getMinimalSupportedVersion());
+        assertEquals(Version.V_6_8_0, createTestInstance().getMinimalSupportedVersion());
     }
 
     public void testcontext() {