Skip to content

Commit

Permalink
Merge branch 'main' into remove-read-connector-secrets
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Jul 9, 2024
2 parents 4b8387e + bfc32a2 commit a2837a5
Show file tree
Hide file tree
Showing 694 changed files with 20,566 additions and 6,916 deletions.
4 changes: 2 additions & 2 deletions .backportrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"upstream" : "elastic/elasticsearch",
"targetBranchChoices" : [ "main", "8.14", "8.13", "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" ],
"targetBranchChoices" : [ "main", "8.15", "8.14", "8.13", "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.15.0$" : "main",
"^v8.16.0$" : "main",
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
}
}
2 changes: 1 addition & 1 deletion .buildkite/pipelines/dra-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ steps:
image: family/elasticsearch-ubuntu-2204
machineType: custom-32-98304
buildDirectory: /dev/shm/bk
diskSizeGb: 250
diskSizeGb: 350
- wait
# The hadoop build depends on the ES artifact
# So let's trigger the hadoop build any time we build a new staging artifact
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/intake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ steps:
timeout_in_minutes: 300
matrix:
setup:
BWC_VERSION: ["7.17.23", "8.14.2", "8.15.0"]
BWC_VERSION: ["7.17.23", "8.14.3", "8.15.0", "8.16.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
23 changes: 20 additions & 3 deletions .buildkite/pipelines/periodic-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,8 @@ steps:
env:
BWC_VERSION: 8.13.4

- label: "{{matrix.image}} / 8.14.2 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.14.2
- label: "{{matrix.image}} / 8.14.3 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.14.3
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -592,7 +592,7 @@ steps:
buildDirectory: /dev/shm/bk
diskSizeGb: 250
env:
BWC_VERSION: 8.14.2
BWC_VERSION: 8.14.3

- label: "{{matrix.image}} / 8.15.0 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.0
Expand All @@ -611,6 +611,23 @@ steps:
env:
BWC_VERSION: 8.15.0

- label: "{{matrix.image}} / 8.16.0 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.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
diskSizeGb: 250
env:
BWC_VERSION: 8.16.0

- group: packaging-tests-windows
steps:
- label: "{{matrix.image}} / packaging-tests-windows"
Expand Down
30 changes: 25 additions & 5 deletions .buildkite/pipelines/periodic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -642,8 +642,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 8.14.2 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.14.2#bwcTest
- label: 8.14.3 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.14.3#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -653,7 +653,7 @@ steps:
preemptible: true
diskSizeGb: 250
env:
BWC_VERSION: 8.14.2
BWC_VERSION: 8.14.3
retry:
automatic:
- exit_status: "-1"
Expand Down Expand Up @@ -682,6 +682,26 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 8.16.0 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.0#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
machineType: n1-standard-32
buildDirectory: /dev/shm/bk
preemptible: true
diskSizeGb: 250
env:
BWC_VERSION: 8.16.0
retry:
automatic:
- exit_status: "-1"
limit: 3
signal_reason: none
- signal_reason: agent_stop
limit: 3

- 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 functionalTests
timeout_in_minutes: 420
Expand Down Expand Up @@ -751,7 +771,7 @@ steps:
setup:
ES_RUNTIME_JAVA:
- openjdk17
BWC_VERSION: ["7.17.23", "8.14.2", "8.15.0"]
BWC_VERSION: ["7.17.23", "8.14.3", "8.15.0", "8.16.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down Expand Up @@ -801,7 +821,7 @@ steps:
- openjdk21
- openjdk22
- openjdk23
BWC_VERSION: ["7.17.23", "8.14.2", "8.15.0"]
BWC_VERSION: ["7.17.23", "8.14.3", "8.15.0", "8.16.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
3 changes: 2 additions & 1 deletion .ci/bwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,6 @@ BWC_VERSION:
- "8.11.4"
- "8.12.2"
- "8.13.4"
- "8.14.2"
- "8.14.3"
- "8.15.0"
- "8.16.0"
3 changes: 2 additions & 1 deletion .ci/snapshotBwcVersions
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
BWC_VERSION:
- "7.17.23"
- "8.14.2"
- "8.14.3"
- "8.15.0"
- "8.16.0"
4 changes: 2 additions & 2 deletions benchmarks/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ dependencies {
api "org.openjdk.jmh:jmh-core:$versions.jmh"
annotationProcessor "org.openjdk.jmh:jmh-generator-annprocess:$versions.jmh"
// Dependencies of JMH
runtimeOnly 'net.sf.jopt-simple:jopt-simple:4.6'
runtimeOnly 'org.apache.commons:commons-math3:3.2'
runtimeOnly 'net.sf.jopt-simple:jopt-simple:5.0.4'
runtimeOnly 'org.apache.commons:commons-math3:3.6.1'
}

// enable the JMH's BenchmarkProcessor to generate the final benchmark classes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public class TermsReduceBenchmark {
private final SearchPhaseController controller = new SearchPhaseController((task, req) -> new AggregationReduceContext.Builder() {
@Override
public AggregationReduceContext forPartialReduction() {
return new AggregationReduceContext.ForPartial(null, null, task, builder);
return new AggregationReduceContext.ForPartial(null, null, task, builder, b -> {});
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public String url(String os, String arch, String extension) {
List<JdkBuild> builds = List.of(
getBundledJdkBuild(),
// 23 early access
new EarlyAccessJdkBuild(JavaLanguageVersion.of(23), "23", "23")
new EarlyAccessJdkBuild(JavaLanguageVersion.of(23), "23", "24")
);

private JdkBuild getBundledJdkBuild() {
Expand Down
4 changes: 2 additions & 2 deletions build-tools-internal/version.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
elasticsearch = 8.15.0
elasticsearch = 8.16.0
lucene = 9.11.1

bundled_jdk_vendor = openjdk
Expand Down Expand Up @@ -49,7 +49,7 @@ commonsCompress = 1.24.0
reflections = 0.10.2

# benchmark dependencies
jmh = 1.26
jmh = 1.37

# test dependencies
# when updating this version, also update :qa:evil-tests
Expand Down
6 changes: 0 additions & 6 deletions docs/changelog/106253.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions docs/changelog/106520.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 106520
summary: Updated the transport CA name in Security Auto-Configuration.
area: Security
type: bug
issues:
- 106455
17 changes: 17 additions & 0 deletions docs/changelog/107191.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
pr: 107191
summary: Stricter failure handling in multi-repo get-snapshots request handling
area: Snapshot/Restore
type: bug
issues: []
highlight:
title: Stricter failure handling in multi-repo get-snapshots request handling
body: |
If a multi-repo get-snapshots request encounters a failure in one of the
targeted repositories then earlier versions of Elasticsearch would proceed
as if the faulty repository did not exist, except for a per-repository
failure report in a separate section of the response body. This makes it
impossible to paginate the results properly in the presence of failures. In
versions 8.15.0 and later this API's failure handling behaviour has been
made stricter, reporting an overall failure if any targeted repository's
contents cannot be listed.
notable: true
5 changes: 0 additions & 5 deletions docs/changelog/109341.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/109492.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/109500.yaml

This file was deleted.

14 changes: 14 additions & 0 deletions docs/changelog/109501.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
pr: 109501
summary: Reflect latest changes in synthetic source documentation
area: Mapping
type: enhancement
issues: []
highlight:
title: Synthetic `_source` improvements
body: |-
There are multiple improvements to synthetic `_source` functionality:
* Synthetic `_source` is now supported for all field types including `nested` and `object`. `object` fields are supported with `enabled` set to `false`.
* Synthetic `_source` can be enabled together with `ignore_malformed` and `ignore_above` parameters for all field types that support them.
notable: false
5 changes: 0 additions & 5 deletions docs/changelog/109533.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/109629.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/109632.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/109636.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions docs/changelog/109667.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 109667
summary: Inference autoscaling
area: Machine Learning
type: feature
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/109684.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 109684
summary: Avoid `ModelAssignment` deadlock
area: Machine Learning
type: bug
issues: []
5 changes: 0 additions & 5 deletions docs/changelog/109695.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/109824.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions docs/changelog/110019.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 110019
summary: Improve mechanism for extracting the result of a `PlainActionFuture`
area: Distributed
type: enhancement
issues:
- 108125
6 changes: 6 additions & 0 deletions docs/changelog/110021.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 110021
summary: "[ES|QL] validate `mv_sort` order"
area: ES|QL
type: bug
issues:
- 109910
5 changes: 0 additions & 5 deletions docs/changelog/110035.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions docs/changelog/110061.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 110061
summary: Avoiding running watch jobs in TickerScheduleTriggerEngine if it is paused
area: Watcher
type: bug
issues:
- 105933
5 changes: 0 additions & 5 deletions docs/changelog/110103.yaml

This file was deleted.

7 changes: 7 additions & 0 deletions docs/changelog/110361.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pr: 110361
summary: Don't detect `PlainActionFuture` deadlock on concurrent complete
area: Distributed
type: bug
issues:
- 110181
- 110360
6 changes: 6 additions & 0 deletions docs/changelog/110391.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 110391
summary: Fix ST_DISTANCE Lucene push-down for complex predicates
area: ES|QL
type: bug
issues:
- 110349
6 changes: 6 additions & 0 deletions docs/changelog/110399.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 110399
summary: "[Inference API] Prevent inference endpoints from being deleted if they are\
\ referenced by semantic text"
area: Machine Learning
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/110400.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 110400
summary: Introduce compute listener
area: ES|QL
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/110431.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 110431
summary: "[Inference API] Fix serialization for inference delete endpoint response"
area: Machine Learning
type: bug
issues: []
7 changes: 7 additions & 0 deletions docs/changelog/110476.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pr: 110476
summary: Fix bug in union-types with type-casting in grouping key of STATS
area: ES|QL
type: bug
issues:
- 109922
- 110477
5 changes: 5 additions & 0 deletions docs/changelog/110520.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 110520
summary: Add protection for OOM during aggregations partial reduction
area: Aggregations
type: enhancement
issues: []
Loading

0 comments on commit a2837a5

Please sign in to comment.