Merge commit '86933ad' into global_seq_no_translog_replicator

Tim-Brooks · Dec 11, 2023 · 8e5cc86 · 8e5cc86
2 parents b015bad + 86933ad
commit 8e5cc86
Show file tree

Hide file tree

Showing 399 changed files with 5,007 additions and 2,706 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -1,9 +1,9 @@
 {
   "upstream" : "elastic/elasticsearch",
-  "targetBranchChoices" : [ "main", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
+  "targetBranchChoices" : [ "main", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
   "targetPRLabels" : [ "backport" ],
   "branchLabelMapping" : {
-    "^v8.12.0$" : "main",
+    "^v8.13.0$" : "main",
     "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
   }
 }
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -48,7 +48,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.16", "8.11.2", "8.12.0"]
+            BWC_VERSION: ["7.17.16", "8.11.3", "8.12.0", "8.13.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -1745,6 +1745,22 @@ steps:
         env:
           BWC_VERSION: 8.11.2
 
+      - label: "{{matrix.image}} / 8.11.3 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.11.3
+        timeout_in_minutes: 300
+        matrix:
+          setup:
+            image:
+              - rocky-8
+              - ubuntu-2004
+        agents:
+          provider: gcp
+          image: family/elasticsearch-{{matrix.image}}
+          machineType: custom-16-32768
+          buildDirectory: /dev/shm/bk
+        env:
+          BWC_VERSION: 8.11.3
+
       - label: "{{matrix.image}} / 8.12.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.12.0
         timeout_in_minutes: 300
@@ -1761,6 +1777,22 @@ steps:
         env:
           BWC_VERSION: 8.12.0
 
+      - label: "{{matrix.image}} / 8.13.0 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.13.0
+        timeout_in_minutes: 300
+        matrix:
+          setup:
+            image:
+              - rocky-8
+              - ubuntu-2004
+        agents:
+          provider: gcp
+          image: family/elasticsearch-{{matrix.image}}
+          machineType: custom-16-32768
+          buildDirectory: /dev/shm/bk
+        env:
+          BWC_VERSION: 8.13.0
+
   - group: packaging-tests-windows
     steps:
       - label: "{{matrix.image}} / packaging-tests-windows"

diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -658,7 +658,7 @@ steps:
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
-          machineType: custom-32-98304
+          machineType: n1-standard-32
           buildDirectory: /dev/shm/bk
         env:
           BWC_VERSION: 7.17.16
@@ -1072,6 +1072,16 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           BWC_VERSION: 8.11.2
+      - label: 8.11.3 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.11.3#bwcTest
+        timeout_in_minutes: 300
+        agents:
+          provider: gcp
+          image: family/elasticsearch-ubuntu-2004
+          machineType: n1-standard-32
+          buildDirectory: /dev/shm/bk
+        env:
+          BWC_VERSION: 8.11.3
       - label: 8.12.0 / bwc
         command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.12.0#bwcTest
         timeout_in_minutes: 300
@@ -1082,6 +1092,16 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           BWC_VERSION: 8.12.0
+      - label: 8.13.0 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.13.0#bwcTest
+        timeout_in_minutes: 300
+        agents:
+          provider: gcp
+          image: family/elasticsearch-ubuntu-2004
+          machineType: n1-standard-32
+          buildDirectory: /dev/shm/bk
+        env:
+          BWC_VERSION: 8.13.0
   - label: concurrent-search-tests
     command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true check
     timeout_in_minutes: 420

diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -106,4 +106,6 @@ BWC_VERSION:
   - "8.11.0"
   - "8.11.1"
   - "8.11.2"
+  - "8.11.3"
   - "8.12.0"
+  - "8.13.0"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,4 +1,5 @@
 BWC_VERSION:
   - "7.17.16"
-  - "8.11.2"
+  - "8.11.3"
   - "8.12.0"
+  - "8.13.0"
diff --git a/branches.json b/branches.json
@@ -4,6 +4,9 @@
     {
       "branch": "main"
     },
+    {
+      "branch": "8.12"
+    },
     {
       "branch": "8.11"
     },

diff --git a/...internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java b/...internal/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java
@@ -108,7 +108,10 @@ public void execute(Task t) {
                 "--add-opens=java.base/java.nio.file=ALL-UNNAMED",
                 "--add-opens=java.base/java.time=ALL-UNNAMED",
                 "--add-opens=java.management/java.lang.management=ALL-UNNAMED",
-                "-XX:+HeapDumpOnOutOfMemoryError"
+                "-XX:+HeapDumpOnOutOfMemoryError",
+                // REMOVE once bumped to a JDK greater than 21.0.1, https://github.com/elastic/elasticsearch/issues/103004
+                "-XX:CompileCommand=exclude,org.apache.lucene.util.MSBRadixSorter::computeCommonPrefixLengthAndBuildHistogram",
+                "-XX:CompileCommand=exclude,org.apache.lucene.util.RadixSelector::computeCommonPrefixLengthAndBuildHistogram"
             );
 
             test.getJvmArgumentProviders().add(new SimpleCommandLineArgumentProvider("-XX:HeapDumpPath=" + heapdumpDir));

diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,5 +1,5 @@
-elasticsearch     = 8.12.0
-lucene            = 9.9.0
+elasticsearch     = 8.13.0
+lucene            = 9.9.0-snapshot-bb4fec631e6
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 21.0.1+12@415e3f918a1f4062a0074a2794853d0d

diff --git a/distribution/src/config/jvm.options b/distribution/src/config/jvm.options
@@ -58,6 +58,10 @@
 # result in less optimal vector performance
 20-:--add-modules=jdk.incubator.vector
 
+# REMOVE once bumped to a JDK greater than 21.0.1, https://github.com/elastic/elasticsearch/issues/103004
+19-21:-XX:CompileCommand=exclude,org.apache.lucene.util.MSBRadixSorter::computeCommonPrefixLengthAndBuildHistogram
+19-21:-XX:CompileCommand=exclude,org.apache.lucene.util.RadixSelector::computeCommonPrefixLengthAndBuildHistogram
+
 ## heap dumps
 
 # generate a heap dump when an allocation from the Java heap fails; heap dumps

diff --git a/docs/changelog/100986.yaml b/docs/changelog/100986.yaml
diff --git a/docs/changelog/101915.yaml b/docs/changelog/101915.yaml
diff --git a/docs/changelog/102057.yaml b/docs/changelog/102057.yaml
diff --git a/docs/changelog/102114.yaml b/docs/changelog/102114.yaml
diff --git a/docs/changelog/102151.yaml b/docs/changelog/102151.yaml
diff --git a/docs/changelog/102220.yaml b/docs/changelog/102220.yaml
diff --git a/docs/changelog/102230.yaml b/docs/changelog/102230.yaml
diff --git a/docs/changelog/102240.yaml b/docs/changelog/102240.yaml
diff --git a/docs/changelog/102250.yaml b/docs/changelog/102250.yaml
diff --git a/docs/changelog/102259.yaml b/docs/changelog/102259.yaml
diff --git a/docs/changelog/102281.yaml b/docs/changelog/102281.yaml
diff --git a/docs/changelog/102282.yaml b/docs/changelog/102282.yaml
diff --git a/docs/changelog/102311.yaml b/docs/changelog/102311.yaml
diff --git a/docs/changelog/102396.yaml b/docs/changelog/102396.yaml
diff --git a/docs/changelog/102399.yaml b/docs/changelog/102399.yaml
diff --git a/docs/changelog/102435.yaml b/docs/changelog/102435.yaml
@@ -0,0 +1,5 @@
+pr: 102435
+summary: S3 first byte latency metric
+area: Search
+type: enhancement
+issues: []
diff --git a/docs/changelog/102467.yaml b/docs/changelog/102467.yaml
diff --git a/docs/changelog/102492.yaml b/docs/changelog/102492.yaml
diff --git a/docs/changelog/102559.yaml b/docs/changelog/102559.yaml
@@ -0,0 +1,5 @@
+pr: 102559
+summary: "Prune unnecessary information from TransportNodesStatsAction.NodeStatsRequest"
+area: Network
+type: enhancement
+issues: [100878]
diff --git a/docs/changelog/102580.yaml b/docs/changelog/102580.yaml
diff --git a/docs/changelog/102599.yaml b/docs/changelog/102599.yaml
diff --git a/docs/changelog/102715.yaml b/docs/changelog/102715.yaml
diff --git a/docs/changelog/102716.yaml b/docs/changelog/102716.yaml
diff --git a/docs/changelog/102779.yaml b/docs/changelog/102779.yaml
diff --git a/docs/changelog/102821.yaml b/docs/changelog/102821.yaml
diff --git a/docs/changelog/102831.yaml b/docs/changelog/102831.yaml
diff --git a/docs/changelog/102891.yaml b/docs/changelog/102891.yaml
diff --git a/docs/changelog/102934.yaml b/docs/changelog/102934.yaml
diff --git a/docs/changelog/103024.yaml b/docs/changelog/103024.yaml
@@ -0,0 +1,6 @@
+pr: 103024
+summary: Fix template simulate setting application ordering
+area: Indices APIs
+type: bug
+issues:
+ - 103008
diff --git a/docs/changelog/103025.yaml b/docs/changelog/103025.yaml
@@ -0,0 +1,5 @@
+pr: 103025
+summary: "Metrics: Allow `AsyncCounters` to switch providers"
+area: Infra/Core
+type: bug
+issues: []
diff --git a/docs/changelog/103033.yaml b/docs/changelog/103033.yaml
@@ -0,0 +1,5 @@
+pr: 103033
+summary: "X-pack/plugin/core: rename `double_metrics` template"
+area: Data streams
+type: enhancement
+issues: []
diff --git a/docs/changelog/103061.yaml b/docs/changelog/103061.yaml
@@ -0,0 +1,5 @@
+pr: 103061
+summary: "[Profiling] Query in parallel only if beneficial"
+area: Application
+type: bug
+issues: []
diff --git a/docs/changelog/103087.yaml b/docs/changelog/103087.yaml
@@ -0,0 +1,5 @@
+pr: 103087
+summary: Use latest version of entsearch ingestion pipeline
+area: Application
+type: bug
+issues: []
diff --git a/docs/changelog/103091.yaml b/docs/changelog/103091.yaml
@@ -0,0 +1,5 @@
+pr: 103091
+summary: "Metrics: Handle null observations in observers"
+area: Infra/Core
+type: bug
+issues: []
diff --git a/docs/changelog/103112.yaml b/docs/changelog/103112.yaml
@@ -0,0 +1,5 @@
+pr: 103112
+summary: Add JIT compiler excludes for `computeCommonPrefixLengthAndBuildHistogram`
+area: Search
+type: bug
+issues: []
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,9 @@ @@
         {
           "branch": "main"
         },
+        {
+          "branch": "8.12"
+        },
         {
           "branch": "8.11"
         },
@@ Expand Down @@