Merge branch '9.0' into backport-9.0

Author: prdoyle

.buildkite/pipelines/intake.yml

@@ -56,7 +56,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["8.16.5", "8.17.4", "8.18.0", "9.0.0"]
+            BWC_VERSION: ["8.16.6", "8.17.4", "8.18.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

.buildkite/pipelines/periodic-packaging.yml

@@ -287,8 +287,8 @@ steps:
         env:
           BWC_VERSION: 8.15.5
 
-      - label: "{{matrix.image}} / 8.16.5 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.5
+      - label: "{{matrix.image}} / 8.16.6 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.6
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -301,7 +301,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.16.5
+          BWC_VERSION: 8.16.6
 
       - label: "{{matrix.image}} / 8.17.4 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.4

.buildkite/pipelines/periodic.yml

@@ -306,8 +306,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 8.16.5 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.5#bwcTest
+      - label: 8.16.6 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.6#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -316,7 +316,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 8.16.5
+          BWC_VERSION: 8.16.6
         retry:
           automatic:
             - exit_status: "-1"
@@ -448,7 +448,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-            BWC_VERSION: ["8.16.5", "8.17.4", "8.18.0", "9.0.0"]
+            BWC_VERSION: ["8.16.6", "8.17.4", "8.18.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
@@ -490,7 +490,7 @@ steps:
             ES_RUNTIME_JAVA:
               - openjdk21
               - openjdk23
-            BWC_VERSION: ["8.16.5", "8.17.4", "8.18.0", "9.0.0"]
+            BWC_VERSION: ["8.16.6", "8.17.4", "8.18.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

.ci/bwcVersions

@@ -15,7 +15,7 @@ BWC_VERSION:
   - "8.13.4"
   - "8.14.3"
   - "8.15.5"
-  - "8.16.5"
+  - "8.16.6"
   - "8.17.4"
   - "8.18.0"
   - "9.0.0"

.ci/snapshotBwcVersions

@@ -1,5 +1,5 @@
 BWC_VERSION:
-  - "8.16.5"
+  - "8.16.6"
   - "8.17.4"
   - "8.18.0"
   - "9.0.0"

muted-tests.yml

@@ -264,6 +264,9 @@ tests:
 - class: org.elasticsearch.index.mapper.ShapeGeometryFieldMapperTests
   method: testCartesianBoundsBlockLoader
   issue: https://github.com/elastic/elasticsearch/issues/122661
+- class: org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests
+  method: testBottomFieldSort
+  issue: https://github.com/elastic/elasticsearch/issues/122911
 
 # Examples:
 #

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

@@ -103,6 +103,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion SKIP_INNER_HITS_SEARCH_SOURCE_BACKPORT_8_16 = def(8_772_0_03);
     public static final TransportVersion QUERY_RULES_LIST_INCLUDES_TYPES_BACKPORT_8_16 = def(8_772_0_04);
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_16_5 = def(8_772_0_05);
+    public static final TransportVersion INITIAL_ELASTICSEARCH_8_16_6 = def(8_772_0_06);
     public static final TransportVersion REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(8_773_0_00);
     public static final TransportVersion REVERT_REMOVE_MIN_COMPATIBLE_SHARD_NODE = def(8_774_0_00);
     public static final TransportVersion ESQL_FIELD_ATTRIBUTE_PARENT_SIMPLIFIED = def(8_775_0_00);

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

@@ -194,6 +194,7 @@ public class Version implements VersionId<Version>, ToXContentFragment {
     public static final Version V_8_16_3 = new Version(8_16_03_99);
     public static final Version V_8_16_4 = new Version(8_16_04_99);
     public static final Version V_8_16_5 = new Version(8_16_05_99);
+    public static final Version V_8_16_6 = new Version(8_16_06_99);
     public static final Version V_8_17_0 = new Version(8_17_00_99);
     public static final Version V_8_17_1 = new Version(8_17_01_99);
     public static final Version V_8_17_2 = new Version(8_17_02_99);

server/src/main/resources/org/elasticsearch/TransportVersions.csv

@@ -138,6 +138,7 @@
 8.16.2,8772004
 8.16.3,8772004
 8.16.4,8772004
+8.16.5,8772005
 8.17.0,8797002
 8.17.1,8797002
 8.17.2,8797002

server/src/main/resources/org/elasticsearch/index/IndexVersions.csv

@@ -138,6 +138,7 @@
 8.16.2,8518000
 8.16.3,8518000
 8.16.4,8518000
+8.16.5,8518000
 8.17.0,8521000
 8.17.1,8521000
 8.17.2,8521000