Skip to content

Handle patch from 8.19 about introducing data stream lifecycle template #125374

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 1 commit into from
Mar 21, 2025
Merged

Handle patch from 8.19 about introducing data stream lifecycle template #125374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 0 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 @@ -152,6 +152,7 @@ static TransportVersion def(int id) {
public static final TransportVersion ESQL_FAILURE_FROM_REMOTE_8_19 = def(8_841_0_11);
public static final TransportVersion ESQL_AGGREGATE_METRIC_DOUBLE_LITERAL_8_19 = def(8_841_0_12);
public static final TransportVersion INFERENCE_MODEL_REGISTRY_METADATA_8_19 = def(8_841_0_13);
public static final TransportVersion INTRODUCE_LIFECYCLE_TEMPLATE_8_19 = def(8_841_0_14);
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
24 changes: 16 additions & 8 deletions server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,15 +279,17 @@ public int hashCode() {
@Override
public void writeTo(StreamOutput out) throws IOException {
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
out.writeOptionalTimeValue(dataRetention);
} else {
writeLegacyOptionalValue(dataRetention, out, StreamOutput::writeTimeValue);
}

}
if (out.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
out.writeOptionalCollection(downsampling);
} else {
writeLegacyOptionalValue(downsampling, out, StreamOutput::writeCollection);
Expand All @@ -298,7 +300,8 @@ public void writeTo(StreamOutput out) throws IOException {

public DataStreamLifecycle(StreamInput in) throws IOException {
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
dataRetention = in.readOptionalTimeValue();
} else {
dataRetention = readLegacyOptionalValue(in, StreamInput::readTimeValue);
Expand All @@ -307,7 +310,8 @@ public DataStreamLifecycle(StreamInput in) throws IOException {
dataRetention = null;
}
if (in.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
downsampling = in.readOptionalCollectionAsList(DownsamplingRound::read);
} else {
downsampling = readLegacyOptionalValue(in, is -> is.readCollectionAsList(DownsamplingRound::read));
Expand Down Expand Up @@ -600,14 +604,16 @@ public Template(boolean enabled, TimeValue dataRetention, List<DataStreamLifecyc
public void writeTo(StreamOutput out) throws IOException {
// The order of the fields is like this for bwc reasons
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
ResettableValue.write(out, dataRetention, StreamOutput::writeTimeValue);
} else {
writeLegacyValue(out, dataRetention, StreamOutput::writeTimeValue);
}
}
if (out.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
ResettableValue.write(out, downsampling, StreamOutput::writeCollection);
} else {
writeLegacyValue(out, downsampling, StreamOutput::writeCollection);
Expand Down Expand Up @@ -657,14 +663,16 @@ public static Template read(StreamInput in) throws IOException {

// The order of the fields is like this for bwc reasons
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
dataRetention = ResettableValue.read(in, StreamInput::readTimeValue);
} else {
dataRetention = readLegacyValues(in, StreamInput::readTimeValue);
}
}
if (in.getTransportVersion().onOrAfter(ADDED_ENABLED_FLAG_VERSION)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE)
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_LIFECYCLE_TEMPLATE_8_19)) {
downsampling = ResettableValue.read(in, i -> i.readCollectionAsList(DownsamplingRound::read));
} else {
downsampling = readLegacyValues(in, i -> i.readCollectionAsList(DownsamplingRound::read));
Expand Down