Merge remote-tracking branch 'elastic/main' into esql-ccs/skip-unavai…

…lable-plan-time-removal
quux00 · Jan 21, 2025 · f63dcd4 · f63dcd4
2 parents 3d8599c + 0488b03
commit f63dcd4
Show file tree

Hide file tree

Showing 737 changed files with 16,639 additions and 7,680 deletions.
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -56,7 +56,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["8.16.3", "8.17.1", "8.18.0", "9.0.0"]
+            BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -287,8 +287,8 @@ steps:
         env:
           BWC_VERSION: 8.15.5
 
-      - label: "{{matrix.image}} / 8.16.3 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.3
+      - label: "{{matrix.image}} / 8.16.4 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.4
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -301,10 +301,10 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.16.3
+          BWC_VERSION: 8.16.4
 
-      - label: "{{matrix.image}} / 8.17.1 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.1
+      - label: "{{matrix.image}} / 8.17.2 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.2
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -317,7 +317,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.17.1
+          BWC_VERSION: 8.17.2
 
       - label: "{{matrix.image}} / 8.18.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.0

diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -306,8 +306,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 8.16.3 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.3#bwcTest
+      - label: 8.16.4 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.4#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -316,7 +316,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 8.16.3
+          BWC_VERSION: 8.16.4
         retry:
           automatic:
             - exit_status: "-1"
@@ -325,8 +325,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 8.17.1 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.1#bwcTest
+      - label: 8.17.2 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.2#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -335,7 +335,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 8.17.1
+          BWC_VERSION: 8.17.2
         retry:
           automatic:
             - exit_status: "-1"
@@ -448,7 +448,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-            BWC_VERSION: ["8.16.3", "8.17.1", "8.18.0", "9.0.0"]
+            BWC_VERSION: ["8.16.4", "8.17.2", "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.3", "8.17.1", "8.18.0", "9.0.0"]
+            BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/scripts/dra-workflow.sh b/.buildkite/scripts/dra-workflow.sh
@@ -22,15 +22,16 @@ if [[ "$BRANCH" == "main" ]]; then
 fi
 
 ES_VERSION=$(grep elasticsearch build-tools-internal/version.properties | sed "s/elasticsearch *= *//g")
+BASE_VERSION="$ES_VERSION"
 echo "ES_VERSION=$ES_VERSION"
 
 VERSION_SUFFIX=""
 if [[ "$WORKFLOW" == "snapshot" ]]; then
   VERSION_SUFFIX="-SNAPSHOT"
 fi
 
-if [[ -n "${VERSION_QUALIFER:-}" ]]; then
-  ES_VERSION = "${ES_VERSION}-${VERSION_QUALIFER}"
+if [[ -n "${VERSION_QUALIFIER:-}" ]]; then
+  ES_VERSION="${ES_VERSION}-${VERSION_QUALIFIER}"
   echo "Version qualifier specified. ES_VERSION=${ES_VERSION}."
 fi
 
@@ -53,8 +54,8 @@ if [[ "$WORKFLOW" == "staging" ]]; then
   BUILD_SNAPSHOT_ARG="-Dbuild.snapshot=false"
 fi
 
-if [[ -n "${VERSION_QUALIFER:-}" ]]; then
-  VERSION_QUALIFIER_ARG="-Dbuild.version_qualifier=$VERSION_QUALIFER"
+if [[ -n "${VERSION_QUALIFIER:-}" ]]; then
+  VERSION_QUALIFIER_ARG="-Dbuild.version_qualifier=$VERSION_QUALIFIER"
 fi
 
 echo --- Building release artifacts
@@ -72,10 +73,10 @@ echo --- Building release artifacts
   :distribution:generateDependenciesReport
 
 PATH="$PATH:${JAVA_HOME}/bin" # Required by the following script
-if [[ -z "${VERSION_QUALIFER:-}" ]]; then
+if [[ -z "${VERSION_QUALIFIER:-}" ]]; then
 x-pack/plugin/sql/connectors/tableau/package.sh asm qualifier="$VERSION_SUFFIX"
 else
-x-pack/plugin/sql/connectors/tableau/package.sh asm qualifier="$VERSION_QUALIFER"
+x-pack/plugin/sql/connectors/tableau/package.sh asm qualifier="-$VERSION_QUALIFIER"
 fi
 
 # we regenerate this file as part of the release manager invocation
@@ -103,8 +104,8 @@ docker run --rm \
   --branch "$RM_BRANCH" \
   --commit "$BUILDKITE_COMMIT" \
   --workflow "$WORKFLOW" \
-  --qualifier "${VERSION_QUALIFER:-}" \
-  --version "$ES_VERSION" \
+  --qualifier "${VERSION_QUALIFIER:-}" \
+  --version "$BASE_VERSION" \
   --artifact-set main \
   --dependency "beats:https://artifacts-${WORKFLOW}.elastic.co/beats/${BEATS_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json" \
   --dependency "ml-cpp:https://artifacts-${WORKFLOW}.elastic.co/ml-cpp/${ML_CPP_BUILD_ID}/manifest-${ES_VERSION}${VERSION_SUFFIX}.json"
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -15,7 +15,7 @@ BWC_VERSION:
   - "8.13.4"
   - "8.14.3"
   - "8.15.5"
-  - "8.16.3"
-  - "8.17.1"
+  - "8.16.4"
+  - "8.17.2"
   - "8.18.0"
   - "9.0.0"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,5 +1,5 @@
 BWC_VERSION:
-  - "8.16.3"
-  - "8.17.1"
+  - "8.16.4"
+  - "8.17.2"
   - "8.18.0"
   - "9.0.0"
diff --git a/...al/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaModulePathPlugin.java b/...al/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaModulePathPlugin.java
@@ -53,7 +53,7 @@ public void apply(Project project) {
     }
 
     // List of root tasks, by name, whose compileJava task should not use the module path. These are test related sources.
-    static final Set<String> EXCLUDES = Set.of(":test:framework", ":x-pack:plugin:eql:qa:common");
+    static final Set<String> EXCLUDES = Set.of(":test:framework", ":x-pack:plugin:eql:qa:common", ":x-pack:plugin:esql:compute:test");
 
     void configureCompileModulePath(Project project) {
         // first disable Gradle's builtin module path inference

diff --git a/...ibution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java b/...ibution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java
@@ -171,8 +171,8 @@ private static Stream<String> maybeAttachEntitlementAgent(boolean useEntitlement
             throw new IllegalStateException("Failed to list entitlement jars in: " + dir, e);
         }
         // We instrument classes in these modules to call the bridge. Because the bridge gets patched
-        // into java.base, we must export the bridge from java.base to these modules.
-        String modulesContainingEntitlementInstrumentation = "java.logging";
+        // into java.base, we must export the bridge from java.base to these modules, as a comma-separated list
+        String modulesContainingEntitlementInstrumentation = "java.logging,java.net.http,java.naming";
         return Stream.of(
             "-Des.entitlements.enabled=true",
             "-XX:+EnableDynamicAgentLoading",

diff --git a/docs/changelog/117469.yaml b/docs/changelog/117469.yaml
diff --git a/docs/changelog/117840.yaml b/docs/changelog/117840.yaml
diff --git a/docs/changelog/117851.yaml b/docs/changelog/117851.yaml
diff --git a/docs/changelog/118454.yaml b/docs/changelog/118454.yaml
diff --git a/docs/changelog/118516.yaml b/docs/changelog/118516.yaml
diff --git a/docs/changelog/118603.yaml b/docs/changelog/118603.yaml
diff --git a/docs/changelog/118619.yaml b/docs/changelog/118619.yaml
@@ -0,0 +1,5 @@
+pr: 118619
+summary: Optional named arguments for function in map
+area: EQL
+type: enhancement
+issues: []
diff --git a/docs/changelog/118757.yaml b/docs/changelog/118757.yaml
diff --git a/docs/changelog/118816.yaml b/docs/changelog/118816.yaml
diff --git a/docs/changelog/118837.yaml b/docs/changelog/118837.yaml
diff --git a/docs/changelog/118844.yaml b/docs/changelog/118844.yaml
diff --git a/docs/changelog/118919.yaml b/docs/changelog/118919.yaml
diff --git a/docs/changelog/118921.yaml b/docs/changelog/118921.yaml
diff --git a/docs/changelog/118954.yaml b/docs/changelog/118954.yaml
diff --git a/docs/changelog/118958.yaml b/docs/changelog/118958.yaml
diff --git a/docs/changelog/118999.yaml b/docs/changelog/118999.yaml
diff --git a/docs/changelog/119131.yaml b/docs/changelog/119131.yaml
diff --git a/docs/changelog/119134.yaml b/docs/changelog/119134.yaml
diff --git a/docs/changelog/119233.yaml b/docs/changelog/119233.yaml
diff --git a/docs/changelog/119449.yaml b/docs/changelog/119449.yaml
diff --git a/docs/changelog/119495.yaml b/docs/changelog/119495.yaml
diff --git a/docs/changelog/119516.yaml b/docs/changelog/119516.yaml
diff --git a/docs/changelog/119536.yaml b/docs/changelog/119536.yaml
@@ -0,0 +1,5 @@
+pr: 119536
+summary: Fix ROUND() with unsigned longs throwing in some edge cases
+area: ES|QL
+type: bug
+issues: []
diff --git a/docs/changelog/119580.yaml b/docs/changelog/119580.yaml
@@ -0,0 +1,5 @@
+pr: 119580
+summary: Do not serialize `EsIndex` in plan
+area: ES|QL
+type: enhancement
+issues: []
diff --git a/docs/changelog/119637.yaml b/docs/changelog/119637.yaml
diff --git a/docs/changelog/119743.yaml b/docs/changelog/119743.yaml
@@ -0,0 +1,5 @@
+pr: 119743
+summary: POC mark read-only
+area: Engine
+type: enhancement
+issues: []
diff --git a/docs/changelog/119750.yaml b/docs/changelog/119750.yaml
diff --git a/docs/changelog/119793.yaml b/docs/changelog/119793.yaml
diff --git a/docs/changelog/119797.yaml b/docs/changelog/119797.yaml
diff --git a/docs/changelog/119897.yaml b/docs/changelog/119897.yaml
diff --git a/docs/changelog/120192.yaml b/docs/changelog/120192.yaml
@@ -0,0 +1,5 @@
+pr: 120192
+summary: Extend `TranslationAware` to all pushable expressions
+area: ES|QL
+type: enhancement
+issues: []
diff --git a/docs/changelog/120244.yaml b/docs/changelog/120244.yaml
@@ -0,0 +1,5 @@
+pr: 120244
+summary: Ignore closed indices for reindex
+area: Data streams
+type: enhancement
+issues: []
diff --git a/docs/changelog/120250.yaml b/docs/changelog/120250.yaml
@@ -0,0 +1,6 @@
+pr: 120250
+summary: "Retry internally when CAS upload is throttled [GCS]"
+area: Snapshot/Restore
+type: enhancement
+issues:
+ - 116546