Skip to content

Failure store lifecycle - claim backport transport version #127633

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
elasticsearchmachine merged 1 commit into from
May 2, 2025
Merged

Failure store lifecycle - claim backport transport version #127633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

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 @@ -164,6 +164,7 @@ static TransportVersion def(int id) {
public static final TransportVersion SEARCH_INCREMENTAL_TOP_DOCS_NULL_BACKPORT_8_19 = def(8_841_0_20);
public static final TransportVersion ML_INFERENCE_SAGEMAKER_8_19 = def(8_841_0_21);
public static final TransportVersion ESQL_REPORT_ORIGINAL_TYPES_BACKPORT_8_19 = def(8_841_0_22);
public static final TransportVersion INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19 = def(8_841_0_23);
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00);
Expand Down
14 changes: 9 additions & 5 deletions server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamFailureStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,9 @@ public DataStreamFailureStore(StreamInput in) throws IOException {
this(
in.readOptionalBoolean(),
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
? in.readOptionalWriteable(DataStreamLifecycle::new)
: null
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
? in.readOptionalWriteable(DataStreamLifecycle::new)
: null
);
}

Expand All @@ -87,7 +88,8 @@ public static Diff<DataStreamFailureStore> readDiffFrom(StreamInput in) throws I
@Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalBoolean(enabled);
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
out.writeOptionalWriteable(lifecycle);
}
}
Expand Down Expand Up @@ -167,15 +169,17 @@ public Template(@Nullable Boolean enabled, @Nullable DataStreamLifecycle.Templat
@Override
public void writeTo(StreamOutput out) throws IOException {
ResettableValue.write(out, enabled, StreamOutput::writeBoolean);
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
ResettableValue.write(out, lifecycle, (o, v) -> v.writeTo(o));
}
}

public static Template read(StreamInput in) throws IOException {
ResettableValue<Boolean> enabled = ResettableValue.read(in, StreamInput::readBoolean);
ResettableValue<DataStreamLifecycle.Template> lifecycle = ResettableValue.undefined();
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
lifecycle = ResettableValue.read(in, DataStreamLifecycle.Template::read);
}
return new Template(enabled, lifecycle);
Expand Down
16 changes: 10 additions & 6 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 @@ -341,7 +341,8 @@ public void writeTo(StreamOutput out) throws IOException {
}
out.writeBoolean(enabled());
}
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
lifecycleType.writeTo(out);
}
}
Expand Down Expand Up @@ -370,8 +371,9 @@ public DataStreamLifecycle(StreamInput in) throws IOException {
enabled = true;
}
lifecycleType = in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
? LifecycleType.read(in)
: LifecycleType.DATA;
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
? LifecycleType.read(in)
: LifecycleType.DATA;
}

/**
Expand Down Expand Up @@ -733,7 +735,8 @@ public void writeTo(StreamOutput out) throws IOException {
}
out.writeBoolean(enabled);
}
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
lifecycleType.writeTo(out);
}
}
Expand Down Expand Up @@ -796,8 +799,9 @@ public static Template read(StreamInput in) throws IOException {
enabled = in.readBoolean();
}
var lifecycleTarget = in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
? LifecycleType.read(in)
: LifecycleType.DATA;
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
? LifecycleType.read(in)
: LifecycleType.DATA;
return new Template(lifecycleTarget, enabled, dataRetention, downsampling);
}

Expand Down
2 changes: 2 additions & 0 deletions server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ public boolean isEmpty() {
@Override
public void writeTo(StreamOutput out) throws IOException {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
|| failureStore == null
|| failureStore().enabled() != null) {
out.writeOptionalWriteable(failureStore);
Expand Down Expand Up @@ -139,6 +140,7 @@ public Template(DataStreamFailureStore.Template template) {
@Override
public void writeTo(StreamOutput out) throws IOException {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
|| failureStore.get() == null
|| failureStore().mapAndGet(DataStreamFailureStore.Template::enabled).get() != null) {
ResettableValue.write(out, failureStore, (o, v) -> v.writeTo(o));
Expand Down
28 changes: 19 additions & 9 deletions ...ore/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamFeatureSetUsage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,26 @@ public DataStreamStats(StreamInput in) throws IOException {
in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0) ? in.readVLong() : 0,
in.getTransportVersion().onOrAfter(TransportVersions.FAILURE_STORE_ENABLED_BY_CLUSTER_SETTING) ? in.readVLong() : 0,
in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0) ? in.readVLong() : 0,
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE) ? in.readVLong() : 0,
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE) ? in.readVLong() : 0,
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
? DataStreamLifecycleFeatureSetUsage.RetentionStats.read(in)
: DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA,
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
? in.readVLong()
: 0,
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
? DataStreamLifecycleFeatureSetUsage.RetentionStats.read(in)
: DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA,
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
? in.readVLong()
: 0,
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
? in.readMap(DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats::new)
: Map.of()
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
? DataStreamLifecycleFeatureSetUsage.RetentionStats.read(in)
: DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA,
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
? DataStreamLifecycleFeatureSetUsage.RetentionStats.read(in)
: DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA,
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
? in.readMap(DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats::new)
: Map.of()
);
}

Expand All @@ -159,7 +168,8 @@ public void writeTo(StreamOutput out) throws IOException {
}
out.writeVLong(this.failureStoreIndicesCount);
}
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
out.writeVLong(failuresLifecycleExplicitlyEnabledCount);
out.writeVLong(failuresLifecycleEffectivelyEnabledCount);
failuresLifecycleDataRetentionStats.writeTo(out);
Expand Down