Skip to content

Commit c023468

Browse files
gmaroulijfreden
gmarouli
authored and
jfreden
committed
Failure store lifecycle - claim backport transport version (elastic#127633)
In this PR we claim the backport to 8.19 version for the introduction of the failure store lifecycle (elastic#127314).
1 parent 9e7eed4 commit c023468

File tree

5 files changed

+41
-20
lines changed

5 files changed

+41
-20
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ static TransportVersion def(int id) {
164164
public static final TransportVersion SEARCH_INCREMENTAL_TOP_DOCS_NULL_BACKPORT_8_19 = def(8_841_0_20);
165165
public static final TransportVersion ML_INFERENCE_SAGEMAKER_8_19 = def(8_841_0_21);
166166
public static final TransportVersion ESQL_REPORT_ORIGINAL_TYPES_BACKPORT_8_19 = def(8_841_0_22);
167+
public static final TransportVersion INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19 = def(8_841_0_23);
167168
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
168169
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
169170
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00);

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ public DataStreamFailureStore(StreamInput in) throws IOException {
7575
this(
7676
in.readOptionalBoolean(),
7777
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
78-
? in.readOptionalWriteable(DataStreamLifecycle::new)
79-
: null
78+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
79+
? in.readOptionalWriteable(DataStreamLifecycle::new)
80+
: null
8081
);
8182
}
8283

@@ -87,7 +88,8 @@ public static Diff<DataStreamFailureStore> readDiffFrom(StreamInput in) throws I
8788
@Override
8889
public void writeTo(StreamOutput out) throws IOException {
8990
out.writeOptionalBoolean(enabled);
90-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
91+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
92+
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
9193
out.writeOptionalWriteable(lifecycle);
9294
}
9395
}
@@ -167,15 +169,17 @@ public Template(@Nullable Boolean enabled, @Nullable DataStreamLifecycle.Templat
167169
@Override
168170
public void writeTo(StreamOutput out) throws IOException {
169171
ResettableValue.write(out, enabled, StreamOutput::writeBoolean);
170-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
172+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
173+
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
171174
ResettableValue.write(out, lifecycle, (o, v) -> v.writeTo(o));
172175
}
173176
}
174177

175178
public static Template read(StreamInput in) throws IOException {
176179
ResettableValue<Boolean> enabled = ResettableValue.read(in, StreamInput::readBoolean);
177180
ResettableValue<DataStreamLifecycle.Template> lifecycle = ResettableValue.undefined();
178-
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
181+
if (in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
182+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
179183
lifecycle = ResettableValue.read(in, DataStreamLifecycle.Template::read);
180184
}
181185
return new Template(enabled, lifecycle);

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,8 @@ public void writeTo(StreamOutput out) throws IOException {
341341
}
342342
out.writeBoolean(enabled());
343343
}
344-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
344+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
345+
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
345346
lifecycleType.writeTo(out);
346347
}
347348
}
@@ -370,8 +371,9 @@ public DataStreamLifecycle(StreamInput in) throws IOException {
370371
enabled = true;
371372
}
372373
lifecycleType = in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
373-
? LifecycleType.read(in)
374-
: LifecycleType.DATA;
374+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
375+
? LifecycleType.read(in)
376+
: LifecycleType.DATA;
375377
}
376378

377379
/**
@@ -733,7 +735,8 @@ public void writeTo(StreamOutput out) throws IOException {
733735
}
734736
out.writeBoolean(enabled);
735737
}
736-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
738+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
739+
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
737740
lifecycleType.writeTo(out);
738741
}
739742
}
@@ -796,8 +799,9 @@ public static Template read(StreamInput in) throws IOException {
796799
enabled = in.readBoolean();
797800
}
798801
var lifecycleTarget = in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
799-
? LifecycleType.read(in)
800-
: LifecycleType.DATA;
802+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
803+
? LifecycleType.read(in)
804+
: LifecycleType.DATA;
801805
return new Template(lifecycleTarget, enabled, dataRetention, downsampling);
802806
}
803807

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public boolean isEmpty() {
7474
@Override
7575
public void writeTo(StreamOutput out) throws IOException {
7676
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
77+
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
7778
|| failureStore == null
7879
|| failureStore().enabled() != null) {
7980
out.writeOptionalWriteable(failureStore);
@@ -139,6 +140,7 @@ public Template(DataStreamFailureStore.Template template) {
139140
@Override
140141
public void writeTo(StreamOutput out) throws IOException {
141142
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
143+
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
142144
|| failureStore.get() == null
143145
|| failureStore().mapAndGet(DataStreamFailureStore.Template::enabled).get() != null) {
144146
ResettableValue.write(out, failureStore, (o, v) -> v.writeTo(o));

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamFeatureSetUsage.java‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,26 @@ public DataStreamStats(StreamInput in) throws IOException {
134134
in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0) ? in.readVLong() : 0,
135135
in.getTransportVersion().onOrAfter(TransportVersions.FAILURE_STORE_ENABLED_BY_CLUSTER_SETTING) ? in.readVLong() : 0,
136136
in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0) ? in.readVLong() : 0,
137-
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE) ? in.readVLong() : 0,
138-
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE) ? in.readVLong() : 0,
139137
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
140-
? DataStreamLifecycleFeatureSetUsage.RetentionStats.read(in)
141-
: DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA,
138+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
139+
? in.readVLong()
140+
: 0,
142141
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
143-
? DataStreamLifecycleFeatureSetUsage.RetentionStats.read(in)
144-
: DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA,
142+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
143+
? in.readVLong()
144+
: 0,
145145
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
146-
? in.readMap(DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats::new)
147-
: Map.of()
146+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
147+
? DataStreamLifecycleFeatureSetUsage.RetentionStats.read(in)
148+
: DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA,
149+
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
150+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
151+
? DataStreamLifecycleFeatureSetUsage.RetentionStats.read(in)
152+
: DataStreamLifecycleFeatureSetUsage.RetentionStats.NO_DATA,
153+
in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
154+
|| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)
155+
? in.readMap(DataStreamLifecycleFeatureSetUsage.GlobalRetentionStats::new)
156+
: Map.of()
148157
);
149158
}
150159

@@ -159,7 +168,8 @@ public void writeTo(StreamOutput out) throws IOException {
159168
}
160169
out.writeVLong(this.failureStoreIndicesCount);
161170
}
162-
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {
171+
if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)
172+
|| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {
163173
out.writeVLong(failuresLifecycleExplicitlyEnabledCount);
164174
out.writeVLong(failuresLifecycleEffectivelyEnabledCount);
165175
failuresLifecycleDataRetentionStats.writeTo(out);

0 commit comments

Comments
 (0)