Skip to content

Migrate transport version 8841_033 #135743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 30, 2025
Merged

Migrate transport version 8841_033 #135743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2d8e597
Migrate transport version 8841_033
jdconrad Sep 30, 2025
64c667d
Merge branch 'main' into mtv25
jdconrad Sep 30, 2025
c50a9ca
Merge branch 'main' into mtv25
jdconrad Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion server/src/main/java/org/elasticsearch/TransportVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ static TransportVersion def(int id) {
public static final TransportVersion JINA_AI_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_020_0_00);
public static final TransportVersion RE_REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(9_021_0_00);
public static final TransportVersion UNASSIGENEDINFO_RESHARD_ADDED = def(9_022_0_00);
public static final TransportVersion INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM = def(9_023_0_00);
public static final TransportVersion MAX_OPERATION_SIZE_REJECTIONS_ADDED = def(9_024_0_00);
public static final TransportVersion RETRY_ILM_ASYNC_ACTION_REQUIRE_ERROR = def(9_025_0_00);
public static final TransportVersion ESQL_SERIALIZE_BLOCK_TYPE_CODE = def(9_026_0_00);
Expand Down
13 changes: 8 additions & 5 deletions server/src/main/java/org/elasticsearch/action/datastreams/GetDataStreamAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -210,6 +211,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<DataStreamInfo>, ToXContentObject {

public static final ParseField STATUS_FIELD = new ParseField("status");
Expand Down Expand Up @@ -347,7 +352,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)) {
if (out.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) {
out.writeOptionalString(indexMode);
}
}
Expand Down Expand Up @@ -591,9 +596,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)
? in.readOptionalString()
: "unknown"
in.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM) ? in.readOptionalString() : "unknown"
);
}

Expand All @@ -602,7 +605,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)) {
if (out.getTransportVersion().supports(INCLUDE_INDEX_MODE_IN_GET_DATA_STREAM)) {
out.writeOptionalString(indexMode);
}
}
Expand Down
1 change: 1 addition & 0 deletions .../main/resources/transport/definitions/referable/include_index_mode_in_get_data_stream.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9023000,8841033