another migration

Author: jdconrad

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -318,7 +318,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_INPUT_TYPE = def(9_105_0_00);
     public static final TransportVersion ML_INFERENCE_SAGEMAKER_ELASTIC = def(9_106_0_00);
     public static final TransportVersion SPARSE_VECTOR_FIELD_PRUNING_OPTIONS = def(9_107_0_00);
-    public static final TransportVersion CLUSTER_STATE_PROJECTS_SETTINGS = def(9_108_0_00);
 
     public static final TransportVersionSet TEST = TransportVersionSet.get("test-potato");
 

server/src/main/java/org/elasticsearch/cluster/metadata/ProjectMetadata.java

@@ -78,6 +78,7 @@
 
 import static org.elasticsearch.cluster.metadata.LifecycleExecutionState.ILM_CUSTOM_METADATA_KEY;
 import static org.elasticsearch.cluster.metadata.Metadata.ALL;
+import static org.elasticsearch.cluster.project.ProjectStateRegistry.CLUSTER_STATE_PROJECTS_SETTINGS;
 import static org.elasticsearch.index.IndexSettings.PREFER_ILM_SETTING;
 
 public class ProjectMetadata implements Iterable<IndexMetadata>, Diffable<ProjectMetadata>, ChunkedToXContent {
@@ -2204,8 +2205,7 @@ public static ProjectMetadata readFrom(StreamInput in) throws IOException {
             builder.put(ReservedStateMetadata.readFrom(in));
         }
 
-        if (in.getTransportVersion()
-            .between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {
+        if (in.getTransportVersion().between(TransportVersions.PROJECT_METADATA_SETTINGS, CLUSTER_STATE_PROJECTS_SETTINGS.local())) {
             Settings.readSettingsFromStream(in);
         }
 
@@ -2240,8 +2240,7 @@ public void writeTo(StreamOutput out) throws IOException {
         VersionedNamedWriteable.writeVersionedWriteables(out, customs.values());
         out.writeCollection(reservedStateMetadata.values());
 
-        if (out.getTransportVersion()
-            .between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {
+        if (out.getTransportVersion().between(TransportVersions.PROJECT_METADATA_SETTINGS, CLUSTER_STATE_PROJECTS_SETTINGS.local())) {
             Settings.EMPTY.writeTo(out);
         }
     }
@@ -2308,8 +2307,7 @@ private ProjectMetadataDiff(ProjectMetadata before, ProjectMetadata after) {
                 DiffableUtils.getStringKeySerializer(),
                 RESERVED_DIFF_VALUE_READER
             );
-            if (in.getTransportVersion()
-                .between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {
+            if (in.getTransportVersion().between(TransportVersions.PROJECT_METADATA_SETTINGS, CLUSTER_STATE_PROJECTS_SETTINGS.local())) {
                 Settings.readSettingsDiffFromStream(in);
             }
         }
@@ -2336,8 +2334,7 @@ public void writeTo(StreamOutput out) throws IOException {
             templates.writeTo(out);
             customs.writeTo(out);
             reservedStateMetadata.writeTo(out);
-            if (out.getTransportVersion()
-                .between(TransportVersions.PROJECT_METADATA_SETTINGS, TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS)) {
+            if (out.getTransportVersion().between(TransportVersions.PROJECT_METADATA_SETTINGS, CLUSTER_STATE_PROJECTS_SETTINGS.local())) {
                 Settings.EMPTY_DIFF.writeTo(out);
             }
         }

server/src/main/java/org/elasticsearch/cluster/project/ProjectStateRegistry.java

@@ -11,7 +11,6 @@
 
 import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersionSet;
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.cluster.AbstractNamedDiffable;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.NamedDiff;
@@ -43,6 +42,8 @@ public class ProjectStateRegistry extends AbstractNamedDiffable<ClusterState.Cus
         "project-state-registry-records-deletions"
     );
 
+    public static final TransportVersionSet CLUSTER_STATE_PROJECTS_SETTINGS = TransportVersionSet.get("cluster-state-projects-settings");
+
     private final Map<ProjectId, Settings> projectsSettings;
     // Projects that have been marked for deletion based on their file-based setting
     private final Set<ProjectId> projectsMarkedForDeletion;
@@ -117,7 +118,7 @@ public String getWriteableName() {
 
     @Override
     public TransportVersion getMinimalSupportedVersion() {
-        return TransportVersions.CLUSTER_STATE_PROJECTS_SETTINGS;
+        return CLUSTER_STATE_PROJECTS_SETTINGS.local();
     }
 
     @Override

server/src/main/resources/org/elasticsearch/transport/cluster-state-projects-settings.json

@@ -0,0 +1,6 @@
+{
+  "name": "cluster-state-projects-settings",
+  "ids": [
+    9108000
+  ]
+}