Merge branch 'main' of github.com:elastic/elasticsearch into ml-eis-auth-v2

Author: jonathan-buttner

.buildkite/pipelines/intake.yml

@@ -65,7 +65,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["8.19.8", "9.1.9", "9.2.2", "9.3.0"]
+            BWC_VERSION: ["8.19.8", "9.1.9", "9.2.3", "9.3.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404

.buildkite/pipelines/periodic-java-ea.yml

@@ -423,8 +423,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 9.2.2 / bwc
-        command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.2#bwcTest
+      - label: 9.2.3 / bwc
+        command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.3#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -433,7 +433,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 9.2.2
+          BWC_VERSION: 9.2.3
         retry:
           automatic:
             - exit_status: "-1"
@@ -538,7 +538,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["8.19.8", "9.1.9", "9.2.2", "9.3.0"]
+            BWC_VERSION: ["8.19.8", "9.1.9", "9.2.3", "9.3.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404

.buildkite/pipelines/periodic-packaging.yml

@@ -384,8 +384,8 @@ steps:
         env:
           BWC_VERSION: 9.1.9
 
-      - label: "{{matrix.image}} / 9.2.2 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.2
+      - label: "{{matrix.image}} / 9.2.3 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.3
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -398,7 +398,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 9.2.2
+          BWC_VERSION: 9.2.3
 
       - label: "{{matrix.image}} / 9.3.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.3.0

.buildkite/pipelines/periodic.yml

@@ -420,8 +420,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 9.2.2 / bwc
-        command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.2.2#bwcTest
+      - label: 9.2.3 / bwc
+        command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.2.3#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -430,7 +430,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 9.2.2
+          BWC_VERSION: 9.2.3
         retry:
           automatic:
             - exit_status: "-1"
@@ -530,7 +530,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-            BWC_VERSION: ["8.19.8", "9.1.9", "9.2.2", "9.3.0"]
+            BWC_VERSION: ["8.19.8", "9.1.9", "9.2.3", "9.3.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404
@@ -575,7 +575,7 @@ steps:
             ES_RUNTIME_JAVA:
               - openjdk21
               - openjdk25
-            BWC_VERSION: ["8.19.8", "9.1.9", "9.2.2", "9.3.0"]
+            BWC_VERSION: ["8.19.8", "9.1.9", "9.2.3", "9.3.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404

.ci/bwcVersions

@@ -21,5 +21,5 @@ BWC_VERSION:
   - "8.19.8"
   - "9.0.8"
   - "9.1.9"
-  - "9.2.2"
+  - "9.2.3"
   - "9.3.0"

.ci/snapshotBwcVersions

@@ -1,5 +1,5 @@
 BWC_VERSION:
   - "8.19.8"
   - "9.1.9"
-  - "9.2.2"
+  - "9.2.3"
   - "9.3.0"

branches.json

@@ -7,7 +7,7 @@
     },
     {
       "branch" : "9.2",
-      "version" : "9.2.2"
+      "version" : "9.2.3"
     },
     {
       "branch" : "9.1",

muted-tests.yml

@@ -487,6 +487,10 @@ tests:
 - class: org.elasticsearch.cluster.routing.allocation.WriteLoadConstraintMonitorTests
   method: testRerouteIsNotCalledWhenNoNodesAreHotSpotting
   issue: https://github.com/elastic/elasticsearch/issues/138924
+- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
+  method: test {p0=search.vectors/60_dense_vector_dynamic_mapping/Sub-objects mapped as dense_vector without dims dynamically map the dim size to the first
+    indexed document}
+  issue: https://github.com/elastic/elasticsearch/issues/138945
 
 # Examples:
 #

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.retrievers/result-diversification/10_mmr_result_diversification_retriever.yml

@@ -322,9 +322,9 @@ teardown:
 
   - match: { hits.total.value: 10 }
   - length: { hits.hits: 3 }
-  - match: { hits.hits.0._source.textbody: "second text" }
-  - match: { hits.hits.1._source.textbody: "sixth text" }
-  - match: { hits.hits.2._source.textbody: "ninth text" }
+  - match: { hits.hits.0._source.textbody: "sixth text" }
+  - match: { hits.hits.1._source.textbody: "ninth text" }
+  - match: { hits.hits.2._source.textbody: "fourth text" }
 
   - do:
       search:
@@ -346,9 +346,9 @@ teardown:
 
   - match: { hits.total.value: 10 }
   - length: { hits.hits: 3 }
-  - match: { hits.hits.0._source.textbody: "second text" }
-  - match: { hits.hits.1._source.textbody: "fourth text" }
-  - match: { hits.hits.2._source.textbody: "fifth text" }
+  - match: { hits.hits.0._source.textbody: "fourth text" }
+  - match: { hits.hits.1._source.textbody: "fifth text" }
+  - match: { hits.hits.2._source.textbody: "seventh text" }
 
 ---
 "Test MMR result diversification byte vector type":
@@ -584,6 +584,27 @@ teardown:
   - match: { status: 400 }
   - match: { error.type: illegal_argument_exception }
 
+  - do:
+      catch: /\[diversify\] MMR result diversification \[size\] of -3 must be greater than zero/
+      search:
+        index: test-result-diversification-index
+        body:
+          retriever:
+            diversify:
+              type: "mmr"
+              field: "textvector"
+              size: -3
+              lambda: 0.7
+              retriever:
+                knn:
+                  field: "textvector"
+                  query_vector: [ 0.5, 0.2, 0.4, 0.4 ]
+                  k: 6
+                  num_candidates: 6
+
+  - match: { status: 400 }
+  - match: { error.type: action_request_validation_exception }
+
   - do:
       catch: /\[diversify\] MMR result diversification must have a \[lambda\] between 0.0 and 1.0. The value provided was null/
       search:

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

@@ -246,6 +246,7 @@ public class Version implements VersionId<Version>, ToXContentFragment {
     public static final Version V_9_2_0 = new Version(9_02_00_99);
     public static final Version V_9_2_1 = new Version(9_02_01_99);
     public static final Version V_9_2_2 = new Version(9_02_02_99);
+    public static final Version V_9_2_3 = new Version(9_02_03_99);
     public static final Version V_9_3_0 = new Version(9_03_00_99);
     public static final Version CURRENT = V_9_3_0;