Skip to content

Commit 1248ca3

Browse files
author
David Roberts
committed
Merge branch 'main' into disable_ml_on_macos_x86_64
2 parents c05fe71 + 8e1f214 commit 1248ca3

File tree

1,040 files changed

+20169
-10647
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,040 files changed

+20169
-10647
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ steps:
4848
timeout_in_minutes: 300
4949
matrix:
5050
setup:
51-
BWC_VERSION: ["7.17.17", "8.11.4", "8.12.0", "8.13.0"]
51+
BWC_VERSION: ["7.17.17", "8.11.5", "8.12.0", "8.13.0"]
5252
agents:
5353
provider: gcp
5454
image: family/elasticsearch-ubuntu-2004

‎.buildkite/pipelines/periodic-packaging.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,22 @@ steps:
17931793
env:
17941794
BWC_VERSION: 8.11.4
17951795

1796+
- label: "{{matrix.image}} / 8.11.5 / packaging-tests-upgrade"
1797+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.11.5
1798+
timeout_in_minutes: 300
1799+
matrix:
1800+
setup:
1801+
image:
1802+
- rocky-8
1803+
- ubuntu-2004
1804+
agents:
1805+
provider: gcp
1806+
image: family/elasticsearch-{{matrix.image}}
1807+
machineType: custom-16-32768
1808+
buildDirectory: /dev/shm/bk
1809+
env:
1810+
BWC_VERSION: 8.11.5
1811+
17961812
- label: "{{matrix.image}} / 8.12.0 / packaging-tests-upgrade"
17971813
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.12.0
17981814
timeout_in_minutes: 300

‎.buildkite/pipelines/periodic-platform-support.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ steps:
8989
setup:
9090
image:
9191
- amazonlinux-2023
92+
- amazonlinux-2
9293
agents:
9394
provider: aws
9495
imagePrefix: elasticsearch-{{matrix.image}}

‎.buildkite/pipelines/periodic.template.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ steps:
22
- group: bwc
33
steps: $BWC_STEPS
44
- label: concurrent-search-tests
5-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true check
5+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
66
timeout_in_minutes: 420
77
agents:
88
provider: gcp
@@ -97,7 +97,7 @@ steps:
9797
diskSizeGb: 350
9898
machineType: custom-32-98304
9999
- label: single-processor-node-tests
100-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.configure_test_clusters_with_one_processor=true check
100+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.configure_test_clusters_with_one_processor=true functionalTests
101101
timeout_in_minutes: 420
102102
agents:
103103
provider: gcp
@@ -182,13 +182,13 @@ steps:
182182
machineType: n2-standard-8
183183
buildDirectory: /dev/shm/bk
184184
if: build.branch == "main" || build.branch == "7.17"
185-
- label: Check branch consistency
185+
- label: check-branch-consistency
186186
command: .ci/scripts/run-gradle.sh branchConsistency
187187
timeout_in_minutes: 15
188188
agents:
189189
provider: gcp
190190
image: family/elasticsearch-ubuntu-2004
191191
machineType: n2-standard-2
192-
- label: Check branch protection rules
192+
- label: check-branch-protection-rules
193193
command: .buildkite/scripts/branch-protection.sh
194194
timeout_in_minutes: 5

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,6 +1102,16 @@ steps:
11021102
buildDirectory: /dev/shm/bk
11031103
env:
11041104
BWC_VERSION: 8.11.4
1105+
- label: 8.11.5 / bwc
1106+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.11.5#bwcTest
1107+
timeout_in_minutes: 300
1108+
agents:
1109+
provider: gcp
1110+
image: family/elasticsearch-ubuntu-2004
1111+
machineType: n1-standard-32
1112+
buildDirectory: /dev/shm/bk
1113+
env:
1114+
BWC_VERSION: 8.11.5
11051115
- label: 8.12.0 / bwc
11061116
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.12.0#bwcTest
11071117
timeout_in_minutes: 300
@@ -1123,7 +1133,7 @@ steps:
11231133
env:
11241134
BWC_VERSION: 8.13.0
11251135
- label: concurrent-search-tests
1126-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true check
1136+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true functionalTests
11271137
timeout_in_minutes: 420
11281138
agents:
11291139
provider: gcp
@@ -1218,7 +1228,7 @@ steps:
12181228
diskSizeGb: 350
12191229
machineType: custom-32-98304
12201230
- label: single-processor-node-tests
1221-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.configure_test_clusters_with_one_processor=true check
1231+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.configure_test_clusters_with_one_processor=true functionalTests
12221232
timeout_in_minutes: 420
12231233
agents:
12241234
provider: gcp
@@ -1303,13 +1313,13 @@ steps:
13031313
machineType: n2-standard-8
13041314
buildDirectory: /dev/shm/bk
13051315
if: build.branch == "main" || build.branch == "7.17"
1306-
- label: Check branch consistency
1316+
- label: check-branch-consistency
13071317
command: .ci/scripts/run-gradle.sh branchConsistency
13081318
timeout_in_minutes: 15
13091319
agents:
13101320
provider: gcp
13111321
image: family/elasticsearch-ubuntu-2004
13121322
machineType: n2-standard-2
1313-
- label: Check branch protection rules
1323+
- label: check-branch-protection-rules
13141324
command: .buildkite/scripts/branch-protection.sh
13151325
timeout_in_minutes: 5

‎.buildkite/scripts/encryption-at-rest.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ touch .output.log
2222
rm -Rf "$WORKSPACE"
2323
ln -s "$PWD" "$WORKSPACE"
2424

25-
.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true check
25+
.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true functionalTests

‎.buildkite/scripts/release-tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ curl --fail -o "${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}/m
2020
curl --fail -o "${ML_IVY_REPO}/maven/org/elasticsearch/ml/ml-cpp/${ES_VERSION}/ml-cpp-${ES_VERSION}.zip" https://artifacts-snapshot.elastic.co/ml-cpp/${ES_VERSION}-SNAPSHOT/downloads/ml-cpp/ml-cpp-${ES_VERSION}-SNAPSHOT.zip
2121

2222
.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dbuild.snapshot=false -Dbuild.ml_cpp.repo=file://${ML_IVY_REPO} \
23-
-Dtests.jvm.argline=-Dbuild.snapshot=false -Dlicense.key=${WORKSPACE}/x-pack/license-tools/src/test/resources/public.key -Dbuild.id=deadbeef build
23+
-Dtests.jvm.argline=-Dbuild.snapshot=false -Dlicense.key=${WORKSPACE}/x-pack/license-tools/src/test/resources/public.key -Dbuild.id=deadbeef assemble functionalTests

‎.ci/bwcVersions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,6 @@ BWC_VERSION:
109109
- "8.11.2"
110110
- "8.11.3"
111111
- "8.11.4"
112+
- "8.11.5"
112113
- "8.12.0"
113114
- "8.13.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BWC_VERSION:
22
- "7.17.17"
3-
- "8.11.4"
3+
- "8.11.5"
44
- "8.12.0"
55
- "8.13.0"

‎benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/BlockBenchmark.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ private static long computeBytesRefCheckSum(BytesRefBlock block, int[] traversal
720720
}
721721

722722
private static long computeDoubleCheckSum(DoubleBlock block, int[] traversalOrder) {
723-
double sum = 0;
723+
long sum = 0;
724724

725725
for (int position : traversalOrder) {
726726
if (block.isNull(position)) {
@@ -729,11 +729,12 @@ private static long computeDoubleCheckSum(DoubleBlock block, int[] traversalOrde
729729
int start = block.getFirstValueIndex(position);
730730
int end = start + block.getValueCount(position);
731731
for (int i = start; i < end; i++) {
732-
sum += block.getDouble(i);
732+
// Use an operation that is not affected by rounding errors. Otherwise, the result may depend on the traversalOrder.
733+
sum += (long) block.getDouble(i);
733734
}
734735
}
735736

736-
return (long) sum;
737+
return sum;
737738
}
738739

739740
private static long computeIntCheckSum(IntBlock block, int[] traversalOrder) {

0 commit comments

Comments
 (0)