Merge branch 'main' into failure-lifecycle-default-retention

gmarouli · web-flow · commit 601d9053efd2 · 2025-05-02T15:33:06.000+03:00
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamFailureStore.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamFailureStore.java
@@ -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
         );
     }
 
@@ -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);
         }
     }
@@ -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);
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamLifecycle.java
@@ -344,7 +344,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);
         }
     }
@@ -373,8 +374,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;
     }
 
     /**
@@ -737,7 +739,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);
             }
         }
@@ -800,8 +803,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);
         }
 
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamOptions.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamOptions.java
@@ -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);
@@ -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));
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamFeatureSetUsage.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/datastreams/DataStreamFeatureSetUsage.java
@@ -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()
             );
         }
 
@@ -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);
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationRequestHandler.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/authorization/ElasticInferenceServiceAuthorizationRequestHandler.java
@@ -24,7 +24,6 @@
 import org.elasticsearch.xpack.inference.services.elastic.response.ElasticInferenceServiceAuthorizationResponseEntity;
 import org.elasticsearch.xpack.inference.telemetry.TraceContext;
 
-import java.util.Locale;
 import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -44,7 +43,7 @@ public class ElasticInferenceServiceAuthorizationRequestHandler {
 
     private static ResponseHandler createAuthResponseHandler() {
         return new ElasticInferenceServiceResponseHandler(
-            String.format(Locale.ROOT, "%s sparse embeddings", ELASTIC_INFERENCE_SERVICE_IDENTIFIER),
+            Strings.format("%s authorization", ELASTIC_INFERENCE_SERVICE_IDENTIFIER),
             ElasticInferenceServiceAuthorizationResponseEntity::fromResponse
         );
     }
diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/request/ElasticInferenceServiceAuthorizationRequest.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/elastic/request/ElasticInferenceServiceAuthorizationRequest.java
@@ -63,7 +63,7 @@ public TraceContext getTraceContext() {
     @Override
     public String getInferenceEntityId() {
         // TODO look into refactoring so we don't even need to return this, look at the RetryingHttpSender to fix this
-        return "";
+        return "authorization_request";
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,8 @@ public void writeTo(StreamOutput out) throws IOException {`
`344`	`344`	`}`
`345`	`345`	`out.writeBoolean(enabled());`
`346`	`346`	`}`
`347`		`- if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {`
	`347`	`+ if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)`
	`348`	`+ \|\| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {`
`348`	`349`	`lifecycleType.writeTo(out);`
`349`	`350`	`}`
`350`	`351`	`}`
`@@ -373,8 +374,9 @@ public DataStreamLifecycle(StreamInput in) throws IOException {`
`373`	`374`	`enabled = true;`
`374`	`375`	`}`
`375`	`376`	`lifecycleType = in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)`
`376`		`- ? LifecycleType.read(in)`
`377`		`- : LifecycleType.DATA;`
	`377`	`+ \|\| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)`
	`378`	`+ ? LifecycleType.read(in)`
	`379`	`+ : LifecycleType.DATA;`
`378`	`380`	`}`
`379`	`381`
`380`	`382`	`/**`
`@@ -737,7 +739,8 @@ public void writeTo(StreamOutput out) throws IOException {`
`737`	`739`	`}`
`738`	`740`	`out.writeBoolean(enabled);`
`739`	`741`	`}`
`740`		`- if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)) {`
	`742`	`+ if (out.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)`
	`743`	`+ \|\| out.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)) {`
`741`	`744`	`lifecycleType.writeTo(out);`
`742`	`745`	`}`
`743`	`746`	`}`
`@@ -800,8 +803,9 @@ public static Template read(StreamInput in) throws IOException {`
`800`	`803`	`enabled = in.readBoolean();`
`801`	`804`	`}`
`802`	`805`	`var lifecycleTarget = in.getTransportVersion().onOrAfter(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE)`
`803`		`- ? LifecycleType.read(in)`
`804`		`- : LifecycleType.DATA;`
	`806`	`+ \|\| in.getTransportVersion().isPatchFrom(TransportVersions.INTRODUCE_FAILURES_LIFECYCLE_BACKPORT_8_19)`
	`807`	`+ ? LifecycleType.read(in)`
	`808`	`+ : LifecycleType.DATA;`
`805`	`809`	`return new Template(lifecycleTarget, enabled, dataRetention, downsampling);`
`806`	`810`	`}`
`807`	`811`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public TraceContext getTraceContext() {`
`63`	`63`	`@Override`
`64`	`64`	`public String getInferenceEntityId() {`
`65`	`65`	`// TODO look into refactoring so we don't even need to return this, look at the RetryingHttpSender to fix this`
`66`		`- return "";`
	`66`	`+ return "authorization_request";`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@Override`