diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index d0c1491090f7f..f9cf4bab85ecd 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -213,7 +213,6 @@ static TransportVersion def(int id) { public static final TransportVersion ESQL_DRIVER_TASK_DESCRIPTION_8_19 = def(8_841_0_30); public static final TransportVersion ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED_8_19 = def(8_841_0_31); public static final TransportVersion FIELD_CAPS_ADD_CLUSTER_ALIAS = def(8_841_0_32); - public static final TransportVersion INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM_BACKPORT_8_19 = def(8_841_0_33); /* * STOP! READ THIS FIRST! No, really, diff --git a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java index efcce1f9d5bfb..6300efaa11eb9 100644 --- a/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java +++ b/server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java @@ -8,6 +8,7 @@ */ package org.elasticsearch.action.datastreams; +import org.elasticsearch.TransportVersion; import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.ActionResponse; @@ -208,6 +209,10 @@ public enum ManagedBy { public static final ParseField DATA_STREAMS_FIELD = new ParseField("data_streams"); + private static final TransportVersion INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM = TransportVersion.fromName( + "include_index_mode_in_get_data_stream" + ); + public static class DataStreamInfo implements SimpleDiffable, ToXContentObject { public static final ParseField STATUS_FIELD = new ParseField("status"); @@ -293,9 +298,7 @@ public DataStreamInfo( : Map.of(); this.templatePreferIlmValue = in.getTransportVersion().onOrAfter(V_8_11_X) ? in.readBoolean() : true; this.maximumTimestamp = in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0) ? in.readOptionalVLong() : null; - this.indexMode = in.getTransportVersion().onOrAfter(TransportVersions.INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM_BACKPORT_8_19) - ? in.readOptionalString() - : null; + this.indexMode = in.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM) ? in.readOptionalString() : null; } public DataStream getDataStream() { @@ -362,7 +365,7 @@ public void writeTo(StreamOutput out) throws IOException { if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) { out.writeOptionalVLong(maximumTimestamp); } - if (out.getTransportVersion().onOrAfter(TransportVersions.INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM_BACKPORT_8_19)) { + if (out.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) { out.writeOptionalString(indexMode); } } @@ -600,9 +603,7 @@ public IndexProperties(StreamInput in) throws IOException { in.readBoolean(), in.readOptionalString(), in.readEnum(ManagedBy.class), - in.getTransportVersion().onOrAfter(TransportVersions.INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM_BACKPORT_8_19) - ? in.readOptionalString() - : "unknown" + in.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM) ? in.readOptionalString() : "unknown" ); } @@ -611,7 +612,7 @@ public void writeTo(StreamOutput out) throws IOException { out.writeBoolean(preferIlm); out.writeOptionalString(ilmPolicyName); out.writeEnum(managedBy); - if (out.getTransportVersion().onOrAfter(TransportVersions.INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM_BACKPORT_8_19)) { + if (out.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) { out.writeOptionalString(indexMode); } } diff --git a/server/src/main/resources/transport/definitions/referable/include_index_mode_in_get_data_stream.csv b/server/src/main/resources/transport/definitions/referable/include_index_mode_in_get_data_stream.csv new file mode 100644 index 0000000000000..7c28d285164ef --- /dev/null +++ b/server/src/main/resources/transport/definitions/referable/include_index_mode_in_get_data_stream.csv @@ -0,0 +1 @@ +9023000,8841033 diff --git a/server/src/test/java/org/elasticsearch/TransportVersionTests.java b/server/src/test/java/org/elasticsearch/TransportVersionTests.java index 3b2a474e0d7f2..ae4368e344e74 100644 --- a/server/src/test/java/org/elasticsearch/TransportVersionTests.java +++ b/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_33) + equalTo(8_841_0_32) ); } }