Skip to content

Commit 01d599e

Browse files
gmaroulismalyshev
gmarouli
authored and
smalyshev
committed
Handle patch from 8.19 about introducing data stream lifecycle template (#125374)
Update `TransportVersions` with the patched version from `8.19.0`: - `main`: #124593 - `8.19.0`: #125199
1 parent dd39b32 commit 01d599e

File tree

2 files changed

+17
-8
lines changed

2 files changed

+17
-8
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ static TransportVersion def(int id) {
152152
public static final TransportVersion ESQL_FAILURE_FROM_REMOTE_8_19 = def(8_841_0_11);
153153
public static final TransportVersion ESQL_AGGREGATE_METRIC_DOUBLE_LITERAL_8_19 = def(8_841_0_12);
154154
public static final TransportVersion INFERENCE_MODEL_REGISTRY_METADATA_8_19 = def(8_841_0_13);
155+
public static final TransportVersion INTRODUCE_LIFECYCLE_TEMPLATE_8_19 = def(8_841_0_14);
155156
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0 = def(9_000_0_00);
156157
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
157158
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90 = def(9_000_0_02);

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -279,15 +279,17 @@ public int hashCode() {
279279
@Override
280280
public void writeTo(StreamOutput out) throws IOException {
281281
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
282-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
282+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
283+
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
283284
out.writeOptionalTimeValue(dataRetention);
284285
} else {
285286
writeLegacyOptionalValue(dataRetention, out, StreamOutput::writeTimeValue);
286287
}
287288

288289
}
289290
if (out.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
290-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
291+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
292+
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
291293
out.writeOptionalCollection(downsampling);
292294
} else {
293295
writeLegacyOptionalValue(downsampling, out, StreamOutput::writeCollection);
@@ -298,7 +300,8 @@ public void writeTo(StreamOutput out) throws IOException {
298300

299301
public DataStreamLifecycle(StreamInput in) throws IOException {
300302
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
301-
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
303+
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
304+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
302305
dataRetention = in.readOptionalTimeValue();
303306
} else {
304307
dataRetention = readLegacyOptionalValue(in, StreamInput::readTimeValue);
@@ -307,7 +310,8 @@ public DataStreamLifecycle(StreamInput in) throws IOException {
307310
dataRetention = null;
308311
}
309312
if (in.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
310-
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
313+
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
314+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
311315
downsampling = in.readOptionalCollectionAsList(DownsamplingRound::read);
312316
} else {
313317
downsampling = readLegacyOptionalValue(in, is -> is.readCollectionAsList(DownsamplingRound::read));
@@ -600,14 +604,16 @@ public Template(boolean enabled, TimeValue dataRetention, List<DataStreamLifecyc
600604
public void writeTo(StreamOutput out) throws IOException {
601605
// The order of the fields is like this for bwc reasons
602606
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
603-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
607+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
608+
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
604609
ResettableValue.write(out, dataRetention, StreamOutput::writeTimeValue);
605610
} else {
606611
writeLegacyValue(out, dataRetention, StreamOutput::writeTimeValue);
607612
}
608613
}
609614
if (out.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
610-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
615+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
616+
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
611617
ResettableValue.write(out, downsampling, StreamOutput::writeCollection);
612618
} else {
613619
writeLegacyValue(out, downsampling, StreamOutput::writeCollection);
@@ -657,14 +663,16 @@ public static Template read(StreamInput in) throws IOException {
657663

658664
// The order of the fields is like this for bwc reasons
659665
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
660-
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
666+
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
667+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
661668
dataRetention = ResettableValue.read(in, StreamInput::readTimeValue);
662669
} else {
663670
dataRetention = readLegacyValues(in, StreamInput::readTimeValue);
664671
}
665672
}
666673
if (in.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
667-
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
674+
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
675+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
668676
downsampling = ResettableValue.read(in, i -> i.readCollectionAsList(DownsamplingRound::read));
669677
} else {
670678
downsampling = readLegacyValues(in, i -> i.readCollectionAsList(DownsamplingRound::read));

0 commit comments

Comments
 (0)