Skip to content

Commit fb723a3

Browse files
authored
Migrate transport version 8841_033 (#135743) (#135749)
Note the added patch version which seemed to be missing from this change, but was already backported to 8.19. ES-12334
1 parent f158400 commit fb723a3

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ static TransportVersion def(int id) {
206206
public static final TransportVersion JINA_AI_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_020_0_00);
207207
public static final TransportVersion RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(9_021_0_00);
208208
public static final TransportVersion UNASSIGENEDINFO_RESHARD_ADDED = def(9_022_0_00);
209-
public static final TransportVersion INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM = def(9_023_0_00);
210209
public static final TransportVersion MAX_OPERATION_SIZE_REJECTIONS_ADDED = def(9_024_0_00);
211210
public static final TransportVersion RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR = def(9_025_0_00);
212211
public static final TransportVersion ESQL_SERIALIZE_BLOCK_TYPE_CODE = def(9_026_0_00);

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99
package org.elasticsearch.action.datastreams;
1010

11+
import org.elasticsearch.TransportVersion;
1112
import org.elasticsearch.TransportVersions;
1213
import org.elasticsearch.action.ActionRequestValidationException;
1314
import org.elasticsearch.action.ActionResponse;
@@ -209,6 +210,10 @@ public enum ManagedBy {
209210

210211
public static final ParseField DATA_STREAMS_FIELD = new ParseField("data_streams");
211212

213+
private static final TransportVersion INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM = TransportVersion.fromName(
214+
"include_index_mode_in_get_data_stream"
215+
);
216+
212217
public static class DataStreamInfo implements SimpleDiffable<DataStreamInfo>, ToXContentObject {
213218

214219
public static final ParseField STATUS_FIELD = new ParseField("status");
@@ -345,7 +350,7 @@ public void writeTo(StreamOutput out) throws IOException {
345350
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_0)) {
346351
out.writeOptionalVLong(maximumTimestamp);
347352
}
348-
if (out.getTransportVersion().onOrAfter(TransportVersions.INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) {
353+
if (out.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) {
349354
out.writeOptionalString(indexMode);
350355
}
351356
}
@@ -583,9 +588,7 @@ public IndexProperties(StreamInput in) throws IOException {
583588
in.readBoolean(),
584589
in.readOptionalString(),
585590
in.readEnum(ManagedBy.class),
586-
in.getTransportVersion().onOrAfter(TransportVersions.INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)
587-
? in.readOptionalString()
588-
: "unknown"
591+
in.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM) ? in.readOptionalString() : "unknown"
589592
);
590593
}
591594

@@ -594,7 +597,7 @@ public void writeTo(StreamOutput out) throws IOException {
594597
out.writeBoolean(preferIlm);
595598
out.writeOptionalString(ilmPolicyName);
596599
out.writeEnum(managedBy);
597-
if (out.getTransportVersion().onOrAfter(TransportVersions.INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) {
600+
if (out.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) {
598601
out.writeOptionalString(indexMode);
599602
}
600603
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9023000,8841033

0 commit comments

Comments
 (0)