Skip to content

Commit 22de378

Browse files
jdconradjdconrad
committed
Migrate transport version 8841_051
1 parent 78e4baa commit 22de378

File tree

6 files changed

+19
-21
lines changed

6 files changed

+19
-21
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ static TransportVersion def(int id) {
192192
public static final TransportVersion ML_INFERENCE_ELASTIC_RERANK_ADDED_8_19 = def(8_841_0_48);
193193
public static final TransportVersion NONE_CHUNKING_STRATEGY_8_19 = def(8_841_0_49);
194194
public static final TransportVersion IDP_CUSTOM_SAML_ATTRIBUTES_ALLOW_LIST_8_19 = def(8_841_0_50);
195-
public static final TransportVersion SETTINGS_IN_DATA_STREAMS_8_19 = def(8_841_0_51);
196195
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
197196
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
198197
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90 = def(9_000_0_02);
@@ -263,7 +262,6 @@ static TransportVersion def(int id) {
263262
public static final TransportVersion SYNONYMS_REFRESH_PARAM = def(9_060_0_00);
264263
public static final TransportVersion DOC_FIELDS_AS_LIST = def(9_061_0_00);
265264
public static final TransportVersion DENSE_VECTOR_OFF_HEAP_STATS = def(9_062_00_0);
266-
public static final TransportVersion SETTINGS_IN_DATA_STREAMS = def(9_064_0_00);
267265
public static final TransportVersion INTRODUCE_FAILURES_LIFECYCLE = def(9_065_0_00);
268266
public static final TransportVersion PROJECT_METADATA_SETTINGS = def(9_066_0_00);
269267
public static final TransportVersion AGGREGATE_METRIC_DOUBLE_BLOCK = def(9_067_0_00);
@@ -280,7 +278,6 @@ static TransportVersion def(int id) {
280278
public static final TransportVersion ML_INFERENCE_HUGGING_FACE_CHAT_COMPLETION_ADDED = def(9_078_0_00);
281279
public static final TransportVersion NODES_STATS_SUPPORTS_MULTI_PROJECT = def(9_079_0_00);
282280
public static final TransportVersion ML_INFERENCE_HUGGING_FACE_RERANK_ADDED = def(9_080_0_00);
283-
public static final TransportVersion SETTINGS_IN_DATA_STREAMS_DRY_RUN = def(9_081_0_00);
284281
public static final TransportVersion ML_INFERENCE_SAGEMAKER_CHAT_COMPLETION = def(9_082_0_00);
285282
public static final TransportVersion ML_INFERENCE_VERTEXAI_CHATCOMPLETION_ADDED = def(9_083_0_00);
286283
public static final TransportVersion INFERENCE_CUSTOM_SERVICE_ADDED = def(9_084_0_00);

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.action.datastreams;
1111

1212
import org.elasticsearch.TransportVersion;
13-
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.action.ActionResponse;
1514
import org.elasticsearch.action.ActionType;
1615
import org.elasticsearch.action.IndicesRequest;
@@ -42,6 +41,7 @@ public class UpdateDataStreamSettingsAction extends ActionType<UpdateDataStreamS
4241
public static final String NAME = "indices:admin/data_stream/settings/update";
4342
public static final UpdateDataStreamSettingsAction INSTANCE = new UpdateDataStreamSettingsAction();
4443

44+
private static final TransportVersion SETTINGS_IN_DATA_STREAMS = TransportVersion.fromName("settings_in_data_streams");
4545
private static final TransportVersion DATA_STREAM_WRITE_INDEX_ONLY_SETTINGS = TransportVersion.fromName(
4646
"data_stream_write_index_only_settings"
4747
);
@@ -88,8 +88,7 @@ public Request(StreamInput in) throws IOException {
8888
super(in);
8989
this.dataStreamNames = in.readStringArray();
9090
this.settings = Settings.readSettingsFromStream(in);
91-
if (in.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS_DRY_RUN)
92-
|| in.getTransportVersion().isPatchFrom(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
91+
if (in.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) {
9392
this.dryRun = in.readBoolean();
9493
} else {
9594
this.dryRun = false;
@@ -101,8 +100,7 @@ public void writeTo(StreamOutput out) throws IOException {
101100
super.writeTo(out);
102101
out.writeStringArray(dataStreamNames);
103102
settings.writeTo(out);
104-
if (out.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS_DRY_RUN)
105-
|| out.getTransportVersion().isPatchFrom(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
103+
if (out.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) {
106104
out.writeBoolean(dryRun);
107105
}
108106
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ public final class DataStream implements SimpleDiffable<DataStream>, ToXContentO
8686

8787
private static final Logger LOGGER = LogManager.getLogger(DataStream.class);
8888

89+
private static final TransportVersion SETTINGS_IN_DATA_STREAMS = TransportVersion.fromName("settings_in_data_streams");
8990
private static final TransportVersion MAPPINGS_IN_DATA_STREAMS = TransportVersion.fromName("mappings_in_data_streams");
9091

9192
public static final NodeFeature DATA_STREAM_FAILURE_STORE_FEATURE = new NodeFeature("data_stream.failure_store");
@@ -334,8 +335,7 @@ public static DataStream read(StreamInput in) throws IOException {
334335
dataStreamOptions = failureStoreEnabled ? DataStreamOptions.FAILURE_STORE_ENABLED : null;
335336
}
336337
final Settings settings;
337-
if (in.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS)
338-
|| in.getTransportVersion().isPatchFrom(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
338+
if (in.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) {
339339
settings = Settings.readSettingsFromStream(in);
340340
} else {
341341
settings = Settings.EMPTY;
@@ -1479,8 +1479,7 @@ public void writeTo(StreamOutput out) throws IOException {
14791479
if (out.getTransportVersion().onOrAfter(DataStream.ADD_DATA_STREAM_OPTIONS_VERSION)) {
14801480
out.writeOptionalWriteable(dataStreamOptions.isEmpty() ? null : dataStreamOptions);
14811481
}
1482-
if (out.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS)
1483-
|| out.getTransportVersion().isPatchFrom(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
1482+
if (out.getTransportVersion().supports(SETTINGS_IN_DATA_STREAMS)) {
14841483
settings.writeTo(out);
14851484
}
14861485
if (out.getTransportVersion().supports(MAPPINGS_IN_DATA_STREAMS)) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9064000,8841051

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
package org.elasticsearch.cluster.metadata;
1111

12-
import org.elasticsearch.TransportVersions;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.common.io.stream.Writeable;
1414
import org.elasticsearch.test.AbstractXContentSerializingTestCase;
1515
import org.elasticsearch.xcontent.XContentParser;
@@ -21,6 +21,7 @@
2121
public class DataStreamOptionsTemplateTests extends AbstractXContentSerializingTestCase<DataStreamOptions.Template> {
2222

2323
public static final DataStreamOptions.Template RESET = new DataStreamOptions.Template(ResettableValue.reset());
24+
private static final TransportVersion SETTINGS_IN_DATA_STREAMS = TransportVersion.fromName("settings_in_data_streams");
2425

2526
@Override
2627
protected Writeable.Reader<DataStreamOptions.Template> instanceReader() {
@@ -126,13 +127,13 @@ public void testTemplateComposition() {
126127
}
127128

128129
public void testBackwardCompatibility() throws IOException {
129-
DataStreamOptions.Template result = copyInstance(DataStreamOptions.Template.EMPTY, TransportVersions.SETTINGS_IN_DATA_STREAMS);
130+
DataStreamOptions.Template result = copyInstance(DataStreamOptions.Template.EMPTY, SETTINGS_IN_DATA_STREAMS);
130131
assertThat(result, equalTo(DataStreamOptions.Template.EMPTY));
131132

132133
DataStreamOptions.Template withEnabled = new DataStreamOptions.Template(
133134
new DataStreamFailureStore.Template(randomBoolean(), DataStreamLifecycleTemplateTests.randomFailuresLifecycleTemplate())
134135
);
135-
result = copyInstance(withEnabled, TransportVersions.SETTINGS_IN_DATA_STREAMS);
136+
result = copyInstance(withEnabled, SETTINGS_IN_DATA_STREAMS);
136137
assertThat(result.failureStore().get().enabled(), equalTo(withEnabled.failureStore().get().enabled()));
137138
assertThat(result.failureStore().get().lifecycle(), equalTo(ResettableValue.undefined()));
138139

@@ -144,13 +145,13 @@ public void testBackwardCompatibility() throws IOException {
144145
: ResettableValue.create(DataStreamLifecycleTemplateTests.randomFailuresLifecycleTemplate())
145146
)
146147
);
147-
result = copyInstance(withoutEnabled, TransportVersions.SETTINGS_IN_DATA_STREAMS);
148+
result = copyInstance(withoutEnabled, SETTINGS_IN_DATA_STREAMS);
148149
assertThat(result, equalTo(DataStreamOptions.Template.EMPTY));
149150

150151
DataStreamOptions.Template withEnabledReset = new DataStreamOptions.Template(
151152
new DataStreamFailureStore.Template(ResettableValue.reset(), ResettableValue.undefined())
152153
);
153-
result = copyInstance(withEnabledReset, TransportVersions.SETTINGS_IN_DATA_STREAMS);
154+
result = copyInstance(withEnabledReset, SETTINGS_IN_DATA_STREAMS);
154155
assertThat(result, equalTo(new DataStreamOptions.Template(ResettableValue.reset())));
155156
}
156157
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
package org.elasticsearch.cluster.metadata;
1111

12-
import org.elasticsearch.TransportVersions;
12+
import org.elasticsearch.TransportVersion;
1313
import org.elasticsearch.common.io.stream.Writeable;
1414
import org.elasticsearch.test.AbstractXContentSerializingTestCase;
1515
import org.elasticsearch.xcontent.XContentParser;
@@ -21,6 +21,8 @@
2121

2222
public class DataStreamOptionsTests extends AbstractXContentSerializingTestCase<DataStreamOptions> {
2323

24+
private static final TransportVersion SETTINGS_IN_DATA_STREAMS = TransportVersion.fromName("settings_in_data_streams");
25+
2426
@Override
2527
protected Writeable.Reader<DataStreamOptions> instanceReader() {
2628
return DataStreamOptions::read;
@@ -57,20 +59,20 @@ protected DataStreamOptions doParseInstance(XContentParser parser) throws IOExce
5759
}
5860

5961
public void testBackwardCompatibility() throws IOException {
60-
DataStreamOptions result = copyInstance(DataStreamOptions.EMPTY, TransportVersions.SETTINGS_IN_DATA_STREAMS);
62+
DataStreamOptions result = copyInstance(DataStreamOptions.EMPTY, SETTINGS_IN_DATA_STREAMS);
6163
assertThat(result, equalTo(DataStreamOptions.EMPTY));
6264

6365
DataStreamOptions withEnabled = new DataStreamOptions(
6466
new DataStreamFailureStore(randomBoolean(), DataStreamLifecycleTests.randomFailuresLifecycle())
6567
);
66-
result = copyInstance(withEnabled, TransportVersions.SETTINGS_IN_DATA_STREAMS);
68+
result = copyInstance(withEnabled, SETTINGS_IN_DATA_STREAMS);
6769
assertThat(result.failureStore().enabled(), equalTo(withEnabled.failureStore().enabled()));
6870
assertThat(result.failureStore().lifecycle(), nullValue());
6971

7072
DataStreamOptions withoutEnabled = new DataStreamOptions(
7173
new DataStreamFailureStore(null, DataStreamLifecycleTests.randomFailuresLifecycle())
7274
);
73-
result = copyInstance(withoutEnabled, TransportVersions.SETTINGS_IN_DATA_STREAMS);
75+
result = copyInstance(withoutEnabled, SETTINGS_IN_DATA_STREAMS);
7476
assertThat(result, equalTo(DataStreamOptions.EMPTY));
7577
}
7678
}

0 commit comments

Comments
 (0)