Skip to content

Migrate transport version 8841_051 #135493

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 2 commits into from
Sep 26, 2025
Merged

Migrate transport version 8841_051 #135493

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22de378
Migrate transport version 8841_051
jdconrad Sep 25, 2025
12d2ddd
add dead version
jdconrad Sep 25, 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
3 changes: 0 additions & 3 deletions 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 @@ -192,7 +192,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);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90 = def(9_000_0_02);
Expand Down Expand Up @@ -263,7 +262,6 @@ static TransportVersion def(int id) {
public static final TransportVersion SYNONYMS_REFRESH_PARAM = def(9_060_0_00);
public static final TransportVersion DOC_FIELDS_AS_LIST = def(9_061_0_00);
public static final TransportVersion DENSE_VECTOR_OFF_HEAP_STATS = def(9_062_00_0);
public static final TransportVersion SETTINGS_IN_DATA_STREAMS = def(9_064_0_00);
public static final TransportVersion INTRODUCE_FAILURES_LIFECYCLE = def(9_065_0_00);
public static final TransportVersion PROJECT_METADATA_SETTINGS = def(9_066_0_00);
public static final TransportVersion AGGREGATE_METRIC_DOUBLE_BLOCK = def(9_067_0_00);
Expand All @@ -280,7 +278,6 @@ static TransportVersion def(int id) {
public static final TransportVersion ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED = def(9_078_0_00);
public static final TransportVersion NODES_STATS_SUPPORTS_MULTI_PROJECT = def(9_079_0_00);
public static final TransportVersion ML_INFERENCE_HUGGING_FACE_RERANK_ADDED = def(9_080_0_00);
public static final TransportVersion SETTINGS_IN_DATA_STREAMS_DRY_RUN = def(9_081_0_00);
public static final TransportVersion ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION = def(9_082_0_00);
public static final TransportVersion ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED = def(9_083_0_00);
public static final TransportVersion INFERENCE_CUSTOM_SERVICE_ADDED = def(9_084_0_00);
Expand Down
8 changes: 3 additions & 5 deletions ...er/src/main/java/org/elasticsearch/action/datastreams/UpdateDataStreamSettingsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
package org.elasticsearch.action.datastreams;

import org.elasticsearch.TransportVersion;
import org.elasticsearch.TransportVersions;
import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.action.ActionType;
import org.elasticsearch.action.IndicesRequest;
Expand Down Expand Up @@ -42,6 +41,7 @@ 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");
private static final TransportVersion DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS = TransportVersion.fromName(
"data_stream_write_index_only_settings"
);
Expand Down Expand Up @@ -88,8 +88,7 @@ public Request(StreamInput in) throws IOException {
super(in);
this.dataStreamNames = in.readStringArray();
this.settings = Settings.readSettingsFromStream(in);
if (in.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS_DRY_RUN)
|| in.getTransportVersion().isPatchFrom(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
if (in.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) {
this.dryRun = in.readBoolean();
} else {
this.dryRun = false;
Expand All @@ -101,8 +100,7 @@ public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
out.writeStringArray(dataStreamNames);
settings.writeTo(out);
if (out.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS_DRY_RUN)
|| out.getTransportVersion().isPatchFrom(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
if (out.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) {
out.writeBoolean(dryRun);
}
}
Expand Down
7 changes: 3 additions & 4 deletions server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ 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");
private static final TransportVersion MAPPINGS_IN_DATA_STREAMS = TransportVersion.fromName("mappings_in_data_streams");

public static final NodeFeature DATA_STREAM_FAILURE_STORE_FEATURE = new NodeFeature("data_stream.failure_store");
Expand Down Expand Up @@ -334,8 +335,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)
|| in.getTransportVersion().isPatchFrom(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
if (in.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) {
settings = Settings.readSettingsFromStream(in);
} else {
settings = Settings.EMPTY;
Expand Down Expand Up @@ -1479,8 +1479,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)
|| out.getTransportVersion().isPatchFrom(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
if (out.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) {
settings.writeTo(out);
}
if (out.getTransportVersion().supports(MAPPINGS_IN_DATA_STREAMS)) {
Expand Down
1 change: 1 addition & 0 deletions server/src/main/resources/transport/definitions/referable/settings_in_data_streams.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9064000,8841051
11 changes: 6 additions & 5 deletions server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamOptionsTemplateTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

package org.elasticsearch.cluster.metadata;

import org.elasticsearch.TransportVersions;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.test.AbstractXContentSerializingTestCase;
import org.elasticsearch.xcontent.XContentParser;
Expand All @@ -21,6 +21,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() {
Expand Down Expand Up @@ -126,13 +127,13 @@ public void testTemplateComposition() {
}

public void testBackwardCompatibility() throws IOException {
DataStreamOptions.Template result = copyInstance(DataStreamOptions.Template.EMPTY, TransportVersions.SETTINGS_IN_DATA_STREAMS);
DataStreamOptions.Template result = copyInstance(DataStreamOptions.Template.EMPTY, SETTINGS_IN_DATA_STREAMS);
assertThat(result, equalTo(DataStreamOptions.Template.EMPTY));

DataStreamOptions.Template withEnabled = new DataStreamOptions.Template(
new DataStreamFailureStore.Template(randomBoolean(), DataStreamLifecycleTemplateTests.randomFailuresLifecycleTemplate())
);
result = copyInstance(withEnabled, TransportVersions.SETTINGS_IN_DATA_STREAMS);
result = copyInstance(withEnabled, SETTINGS_IN_DATA_STREAMS);
assertThat(result.failureStore().get().enabled(), equalTo(withEnabled.failureStore().get().enabled()));
assertThat(result.failureStore().get().lifecycle(), equalTo(ResettableValue.undefined()));

Expand All @@ -144,13 +145,13 @@ public void testBackwardCompatibility() throws IOException {
: ResettableValue.create(DataStreamLifecycleTemplateTests.randomFailuresLifecycleTemplate())
)
);
result = copyInstance(withoutEnabled, TransportVersions.SETTINGS_IN_DATA_STREAMS);
result = copyInstance(withoutEnabled, SETTINGS_IN_DATA_STREAMS);
assertThat(result, equalTo(DataStreamOptions.Template.EMPTY));

DataStreamOptions.Template withEnabledReset = new DataStreamOptions.Template(
new DataStreamFailureStore.Template(ResettableValue.reset(), ResettableValue.undefined())
);
result = copyInstance(withEnabledReset, TransportVersions.SETTINGS_IN_DATA_STREAMS);
result = copyInstance(withEnabledReset, SETTINGS_IN_DATA_STREAMS);
assertThat(result, equalTo(new DataStreamOptions.Template(ResettableValue.reset())));
}
}
10 changes: 6 additions & 4 deletions server/src/test/java/org/elasticsearch/cluster/metadata/DataStreamOptionsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

package org.elasticsearch.cluster.metadata;

import org.elasticsearch.TransportVersions;
import org.elasticsearch.TransportVersion;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.test.AbstractXContentSerializingTestCase;
import org.elasticsearch.xcontent.XContentParser;
Expand All @@ -21,6 +21,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;
Expand Down Expand Up @@ -57,20 +59,20 @@ protected DataStreamOptions doParseInstance(XContentParser parser) throws IOExce
}

public void testBackwardCompatibility() throws IOException {
DataStreamOptions result = copyInstance(DataStreamOptions.EMPTY, TransportVersions.SETTINGS_IN_DATA_STREAMS);
DataStreamOptions result = copyInstance(DataStreamOptions.EMPTY, SETTINGS_IN_DATA_STREAMS);
assertThat(result, equalTo(DataStreamOptions.EMPTY));

DataStreamOptions withEnabled = new DataStreamOptions(
new DataStreamFailureStore(randomBoolean(), DataStreamLifecycleTests.randomFailuresLifecycle())
);
result = copyInstance(withEnabled, TransportVersions.SETTINGS_IN_DATA_STREAMS);
result = copyInstance(withEnabled, SETTINGS_IN_DATA_STREAMS);
assertThat(result.failureStore().enabled(), equalTo(withEnabled.failureStore().enabled()));
assertThat(result.failureStore().lifecycle(), nullValue());

DataStreamOptions withoutEnabled = new DataStreamOptions(
new DataStreamFailureStore(null, DataStreamLifecycleTests.randomFailuresLifecycle())
);
result = copyInstance(withoutEnabled, TransportVersions.SETTINGS_IN_DATA_STREAMS);
result = copyInstance(withoutEnabled, SETTINGS_IN_DATA_STREAMS);
assertThat(result, equalTo(DataStreamOptions.EMPTY));
}
}