Migrate transport version 8841_051 (elastic#135493) (elastic#135551)

Backports the following commits to 8.19:
 - Migrate transport version 8841_051 (elastic#135493)

Author: jdconrad

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

@@ -231,7 +231,6 @@ static TransportVersion def(int id) {
     public static final TransportVersion ML_INFERENCE_ELASTIC_RERANK_ADDED_8_19 = def(8_841_0_48);
     public static final TransportVersion NONE_CHUNKING_STRATEGY_8_19 = def(8_841_0_49);
     public static final TransportVersion IDP_CUSTOM_SAML_ATTRIBUTES_ALLOW_LIST_8_19 = def(8_841_0_50);
-    public static final TransportVersion SETTINGS_IN_DATA_STREAMS_8_19 = def(8_841_0_51);
 
     /*
      * STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/action/datastreams/UpdateDataStreamSettingsAction.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.action.datastreams;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.IndicesRequest;
@@ -40,6 +41,8 @@ public class UpdateDataStreamSettingsAction extends ActionType<UpdateDataStreamS
     public static final String NAME = "indices:admin/data_stream/settings/update";
     public static final UpdateDataStreamSettingsAction INSTANCE = new UpdateDataStreamSettingsAction();
 
+    private static final TransportVersion SETTINGS_IN_DATA_STREAMS = TransportVersion.fromName("settings_in_data_streams");
+
     public UpdateDataStreamSettingsAction() {
         super(NAME);
     }
@@ -82,15 +85,21 @@ public Request(StreamInput in) throws IOException {
             super(in);
             this.dataStreamNames = in.readStringArray();
             this.settings = Settings.readSettingsFromStream(in);
-            this.dryRun = in.readBoolean();
+            if (in.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) {
+                this.dryRun = in.readBoolean();
+            } else {
+                this.dryRun = false;
+            }
         }
 
         @Override
         public void writeTo(StreamOutput out) throws IOException {
             super.writeTo(out);
             out.writeStringArray(dataStreamNames);
             settings.writeTo(out);
-            out.writeBoolean(dryRun);
+            if (out.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) {
+                out.writeBoolean(dryRun);
+            }
         }
 
         @Override

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

@@ -75,6 +75,8 @@ public final class DataStream implements SimpleDiffable<DataStream>, ToXContentO
 
     private static final Logger LOGGER = LogManager.getLogger(DataStream.class);
 
+    private static final TransportVersion SETTINGS_IN_DATA_STREAMS = TransportVersion.fromName("settings_in_data_streams");
+
     public static final NodeFeature DATA_STREAM_FAILURE_STORE_FEATURE = new NodeFeature("data_stream.failure_store");
     public static final boolean LOGS_STREAM_FEATURE_FLAG = new FeatureFlag("logs_stream").isEnabled();
     public static final TransportVersion ADDED_FAILURE_STORE_TRANSPORT_VERSION = TransportVersions.V_8_12_0;
@@ -284,7 +286,7 @@ public static DataStream read(StreamInput in) throws IOException {
             dataStreamOptions = failureStoreEnabled ? DataStreamOptions.FAILURE_STORE_ENABLED : null;
         }
         final Settings settings;
-        if (in.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
+        if (in.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) {
             settings = Settings.readSettingsFromStream(in);
         } else {
             settings = Settings.EMPTY;
@@ -1332,7 +1334,7 @@ public void writeTo(StreamOutput out) throws IOException {
         if (out.getTransportVersion().onOrAfter(DataStream.ADD_DATA_STREAM_OPTIONS_VERSION)) {
             out.writeOptionalWriteable(dataStreamOptions.isEmpty() ? null : dataStreamOptions);
         }
-        if (out.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
+        if (out.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) {
             settings.writeTo(out);
         }
     }

server/src/main/resources/transport/definitions/referable/settings_in_data_streams.csv

@@ -0,0 +1 @@
+9064000,8841051

server/src/main/resources/transport/definitions/unreferable/dead_settings_in_data_streams.csv

@@ -0,0 +1 @@
+9081000

server/src/test/java/org/elasticsearch/TransportVersionTests.java

@@ -467,7 +467,7 @@ public void testTransportVersionsLocked() {
             "TransportVersions.java is locked. Generate transport versions with TransportVersion.fromName "
                 + "and generateTransportVersion gradle task",
             versions.get(versions.size() - 1).id(),
-            equalTo(8_841_0_51)
+            equalTo(8_841_0_50)
         );
     }
 }

server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamOptionsTemplateTests.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.cluster.metadata;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.test.AbstractXContentSerializingTestCase;
@@ -21,6 +22,7 @@
 public class DataStreamOptionsTemplateTests extends AbstractXContentSerializingTestCase<DataStreamOptions.Template> {
 
     public static final DataStreamOptions.Template RESET = new DataStreamOptions.Template(ResettableValue.reset());
+    private static final TransportVersion SETTINGS_IN_DATA_STREAMS = TransportVersion.fromName("settings_in_data_streams");
 
     @Override
     protected Writeable.Reader<DataStreamOptions.Template> instanceReader() {
@@ -153,6 +155,7 @@ public void testBackwardCompatibility() throws IOException {
         DataStreamOptions.Template withEnabledReset = new DataStreamOptions.Template(
             new DataStreamFailureStore.Template(ResettableValue.reset(), ResettableValue.undefined())
         );
+
         result = copyInstance(withEnabledReset, TransportVersions.SEARCH_INCREMENTAL_TOP_DOCS_NULL_BACKPORT_8_19);
         assertThat(result, equalTo(new DataStreamOptions.Template(ResettableValue.reset())));
     }

server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamOptionsTests.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.cluster.metadata;
 
+import org.elasticsearch.TransportVersion;
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.test.AbstractXContentSerializingTestCase;
@@ -21,6 +22,8 @@
 
 public class DataStreamOptionsTests extends AbstractXContentSerializingTestCase<DataStreamOptions> {
 
+    private static final TransportVersion SETTINGS_IN_DATA_STREAMS = TransportVersion.fromName("settings_in_data_streams");
+
     @Override
     protected Writeable.Reader<DataStreamOptions> instanceReader() {
         return DataStreamOptions::read;