Skip to content

Commit 75c602d

Browse files
authored
Claiming a transport version for the data stream settings backport (#129560)
1 parent 950a0e0 commit 75c602d

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ static TransportVersion def(int id) {
196196
public static final TransportVersion ML_INFERENCE_ELASTIC_RERANK_ADDED_8_19 = def(8_841_0_48);
197197
public static final TransportVersion NONE_CHUNKING_STRATEGY_8_19 = def(8_841_0_49);
198198
public static final TransportVersion IDP_CUSTOM_SAML_ATTRIBUTES_ALLOW_LIST_8_19 = def(8_841_0_50);
199+
public static final TransportVersion SETTINGS_IN_DATA_STREAMS_8_19 = def(8_841_0_51);
199200
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
200201
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
201202
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ public Request(StreamInput in) throws IOException {
8383
super(in);
8484
this.dataStreamNames = in.readStringArray();
8585
this.settings = Settings.readSettingsFromStream(in);
86-
if (in.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS)) {
86+
if (in.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS_DRY_RUN)
87+
|| in.getTransportVersion().isPatchFrom(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
8788
this.dryRun = in.readBoolean();
8889
} else {
8990
this.dryRun = false;
@@ -95,7 +96,8 @@ public void writeTo(StreamOutput out) throws IOException {
9596
super.writeTo(out);
9697
out.writeStringArray(dataStreamNames);
9798
settings.writeTo(out);
98-
if (out.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS_DRY_RUN)) {
99+
if (out.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS_DRY_RUN)
100+
|| out.getTransportVersion().isPatchFrom(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
99101
out.writeBoolean(dryRun);
100102
}
101103
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,8 @@ public static DataStream read(StreamInput in) throws IOException {
280280
dataStreamOptions = failureStoreEnabled ? DataStreamOptions.FAILURE_STORE_ENABLED : null;
281281
}
282282
final Settings settings;
283-
if (in.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS)) {
283+
if (in.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS)
284+
|| in.getTransportVersion().isPatchFrom(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
284285
settings = Settings.readSettingsFromStream(in);
285286
} else {
286287
settings = Settings.EMPTY;
@@ -1349,7 +1350,8 @@ public void writeTo(StreamOutput out) throws IOException {
13491350
if (out.getTransportVersion().onOrAfter(DataStream.ADD_DATA_STREAM_OPTIONS_VERSION)) {
13501351
out.writeOptionalWriteable(dataStreamOptions.isEmpty() ? null : dataStreamOptions);
13511352
}
1352-
if (out.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS)) {
1353+
if (out.getTransportVersion().onOrAfter(TransportVersions.SETTINGS_IN_DATA_STREAMS)
1354+
|| out.getTransportVersion().isPatchFrom(TransportVersions.SETTINGS_IN_DATA_STREAMS_8_19)) {
13531355
settings.writeTo(out);
13541356
}
13551357
}

0 commit comments

Comments
 (0)