Merge remote-tracking branch 'upstream/main'

Author: drempapis

docs/changelog/120392.yaml

@@ -0,0 +1,6 @@
+pr: 120392
+summary: Test/107515 restore template with match only text mapper it fail
+area: Search
+type: bug
+issues:
+ - 107515

docs/changelog/120617.yaml

@@ -0,0 +1,5 @@
+pr: 120617
+summary: Fix queries with document level security on lookup indexes
+area: ES|QL
+type: bug
+issues: [120509]

docs/changelog/120717.yaml

@@ -0,0 +1,6 @@
+pr: 120717
+summary: Fix LTR rescorer throws 'local model reference is null' on multi-shards index when explained is enabled
+area: Ranking
+type: bug
+issues:
+ - 120739

docs/changelog/120781.yaml

@@ -0,0 +1,5 @@
+pr: 120781
+summary: Add back `keep_alive` to `async_search.submit` rest-api-spec
+area: Search
+type: bug
+issues: []

modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamsSnapshotsIT.java

@@ -1137,11 +1137,8 @@ public void testPartialRestoreSnapshotThatIncludesDataStream() {
 
     /**
      * This test is a copy of the {@link #testPartialRestoreSnapshotThatIncludesDataStream()} the only difference
-     * is that one include the global state and one doesn't. In general this shouldn't matter that's why it used to be
-     * a random parameter of the test, but because of #107515 it fails when we include the global state. Keep them
-     * separate until this is fixed.
+     * is that one include the global state and one doesn't.
      */
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/107515")
     public void testPartialRestoreSnapshotThatIncludesDataStreamWithGlobalState() {
         final String snapshot = "test-snapshot";
         final String indexWithoutDataStream = "test-idx-no-ds";
@@ -1307,11 +1304,8 @@ public void testExcludeDSFromSnapshotWhenExcludingAnyOfItsIndices() {
 
     /**
      * This test is a copy of the {@link #testExcludeDSFromSnapshotWhenExcludingAnyOfItsIndices()} ()} the only difference
-     * is that one include the global state and one doesn't. In general this shouldn't matter that's why it used to be
-     * a random parameter of the test, but because of #107515 it fails when we include the global state. Keep them
-     * separate until this is fixed.
+     * is that one include the global state and one doesn't.
      */
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/107515")
     public void testExcludeDSFromSnapshotWhenExcludingItsIndicesWithGlobalState() {
         final String snapshot = "test-snapshot";
         final String indexWithoutDataStream = "test-idx-no-ds";
@@ -1477,10 +1471,6 @@ public void testWarningHeaderAbsentOnRestoreWithTemplates() throws Exception {
 
     }
 
-    /**
-     * This test is muted as it's awaiting the same fix as {@link #testPartialRestoreSnapshotThatIncludesDataStreamWithGlobalState()}
-     */
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/107515")
     public void testWarningHeaderOnRestoreTemplateFromSnapshot() throws Exception {
         String datastreamName = "ds";
 

rest-api-spec/src/main/resources/rest-api-spec/api/async_search.submit.json

@@ -43,6 +43,11 @@
         "description":"Control whether the response should be stored in the cluster if it completed within the provided [wait_for_completion] time (default: false)",
         "default":false
       },
+      "keep_alive": {
+        "type": "time",
+        "description": "Update the time interval in which the results (partial or final) for this search will be available",
+        "default": "5d"
+      },
       "batched_reduce_size":{
         "type":"number",
         "description":"The number of shard results that should be reduced at once on the coordinating node. This value should be used as the granularity at which progress results will be made available.",

server/src/main/java/org/elasticsearch/ReleaseVersions.java

@@ -10,7 +10,7 @@
 package org.elasticsearch;
 
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.core.UpdateForV9;
+import org.elasticsearch.core.UpdateForV10;
 import org.elasticsearch.internal.BuildExtension;
 import org.elasticsearch.plugins.ExtensionLoader;
 
@@ -114,8 +114,7 @@ private static IntFunction<String> lookupFunction(NavigableMap<Integer, List<Ver
                     // this will no longer be the case with ES 10 (which won't know about ES v8.x where we introduced separated versions)
                     // maybe keep the release mapping around in the csv file?
                     // SEP for now
-                    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
-                    // @UpdateForV10(owner = UpdateForV10.Owner.CORE_INFRA)
+                    @UpdateForV10(owner = UpdateForV10.Owner.CORE_INFRA)
                     Version oldVersion = Version.fromId(id);
                     return oldVersion.toString();
                 }

server/src/main/java/org/elasticsearch/Version.java

@@ -14,8 +14,8 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.Assertions;
+import org.elasticsearch.core.RestApiVersion;
 import org.elasticsearch.core.SuppressForbidden;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.monitor.jvm.JvmInfo;
 import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -242,17 +242,15 @@ public class Version implements VersionId<Version>, ToXContentFragment {
         VERSION_STRINGS = Map.copyOf(builderByString);
     }
 
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
-    // Re-enable this assertion once the rest api version is bumped
     private static void assertRestApiVersion() {
-        // assert RestApiVersion.current().major == CURRENT.major && RestApiVersion.previous().major == CURRENT.major - 1
-        // : "RestApiVersion must be upgraded "
-        // + "to reflect major from Version.CURRENT ["
-        // + CURRENT.major
-        // + "]"
-        // + " but is still set to ["
-        // + RestApiVersion.current().major
-        // + "]";
+        assert RestApiVersion.current().major == CURRENT.major && RestApiVersion.previous().major == CURRENT.major - 1
+            : "RestApiVersion must be upgraded "
+                + "to reflect major from Version.CURRENT ["
+                + CURRENT.major
+                + "]"
+                + " but is still set to ["
+                + RestApiVersion.current().major
+                + "]";
     }
 
     public static Version readVersion(StreamInput in) throws IOException {

server/src/main/java/org/elasticsearch/cluster/ClusterState.java

@@ -47,7 +47,6 @@
 import org.elasticsearch.common.xcontent.ChunkedToXContentHelper;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.SuppressForbidden;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.shard.IndexLongFieldRange;
 import org.elasticsearch.indices.SystemIndexDescriptor;
 import org.elasticsearch.xcontent.ToXContent;
@@ -1039,12 +1038,6 @@ public static ClusterState readFrom(StreamInput in, DiscoveryNode localNode) thr
         return builder.build();
     }
 
-    /**
-     * If the cluster state does not contain transport version information, this is the version
-     * that is inferred for all nodes on version 8.8.0 or above.
-     */
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
-    public static final TransportVersion INFERRED_TRANSPORT_VERSION = TransportVersions.V_8_8_0;
     public static final Version VERSION_INTRODUCING_TRANSPORT_VERSIONS = Version.V_8_8_0;
 
     @Override

server/src/main/java/org/elasticsearch/env/BuildVersion.java

@@ -73,6 +73,12 @@ public abstract class BuildVersion implements ToXContentFragment, Writeable {
      */
     public abstract String toNodeMetadata();
 
+    /**
+     * Returns the minimum compatible build version based on the current version.
+     * Ie a node needs to have at least the return version in order to communicate with a node running the current version.
+     */
+    public abstract BuildVersion minimumCompatibilityVersion();
+
     /**
      * Create a {@link BuildVersion} from a version ID number.
      *