Skip to content

Commit 4cd53df

Browse files
idegtiarenkoidegtiarenko
authored
Merge branch '9.1' into backport/9.1/pr-133704
2 parents 19f3fc2 + cd3188d commit 4cd53df

File tree

58 files changed

+600
-483
lines changed

Some content is hidden

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

58 files changed

+600
-483
lines changed

‎.backportrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"targetBranchChoices" : [ "main", "9.1", "9.0", "8.19", "8.18", "8.17", "8.16", "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" ],
44
"targetPRLabels" : [ "backport" ],
55
"branchLabelMapping" : {
6-
"^v9.1.3$" : "main",
6+
"^v9.1.4$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.18.6", "8.19.3", "9.0.6", "9.1.3"]
68+
BWC_VERSION: ["8.18.7", "8.19.4", "9.0.7", "9.1.4"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ steps:
1010
buildDirectory: /dev/shm/bk
1111
matrix:
1212
setup:
13-
FWC_VERSION: ["9.1.0", "9.1.1", "9.1.2"]
13+
FWC_VERSION: ["9.1.0", "9.1.1", "9.1.2", "9.1.3"]
1414
env:
1515
FWC_VERSION: $FWC_VERSION

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ steps:
318318
env:
319319
BWC_VERSION: 8.17.10
320320

321-
- label: "{{matrix.image}} / 8.18.6 / packaging-tests-upgrade"
322-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.6
321+
- label: "{{matrix.image}} / 8.18.7 / packaging-tests-upgrade"
322+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.7
323323
timeout_in_minutes: 300
324324
matrix:
325325
setup:
@@ -332,10 +332,10 @@ steps:
332332
machineType: custom-16-32768
333333
buildDirectory: /dev/shm/bk
334334
env:
335-
BWC_VERSION: 8.18.6
335+
BWC_VERSION: 8.18.7
336336

337-
- label: "{{matrix.image}} / 8.19.3 / packaging-tests-upgrade"
338-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.3
337+
- label: "{{matrix.image}} / 8.19.4 / packaging-tests-upgrade"
338+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.4
339339
timeout_in_minutes: 300
340340
matrix:
341341
setup:
@@ -348,10 +348,10 @@ steps:
348348
machineType: custom-16-32768
349349
buildDirectory: /dev/shm/bk
350350
env:
351-
BWC_VERSION: 8.19.3
351+
BWC_VERSION: 8.19.4
352352

353-
- label: "{{matrix.image}} / 9.0.6 / packaging-tests-upgrade"
354-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.6
353+
- label: "{{matrix.image}} / 9.0.7 / packaging-tests-upgrade"
354+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.7
355355
timeout_in_minutes: 300
356356
matrix:
357357
setup:
@@ -364,10 +364,10 @@ steps:
364364
machineType: custom-16-32768
365365
buildDirectory: /dev/shm/bk
366366
env:
367-
BWC_VERSION: 9.0.6
367+
BWC_VERSION: 9.0.7
368368

369-
- label: "{{matrix.image}} / 9.1.3 / packaging-tests-upgrade"
370-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.3
369+
- label: "{{matrix.image}} / 9.1.4 / packaging-tests-upgrade"
370+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.4
371371
timeout_in_minutes: 300
372372
matrix:
373373
setup:
@@ -380,7 +380,7 @@ steps:
380380
machineType: custom-16-32768
381381
buildDirectory: /dev/shm/bk
382382
env:
383-
BWC_VERSION: 9.1.3
383+
BWC_VERSION: 9.1.4
384384

385385
- group: packaging-tests-windows
386386
steps:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ steps:
246246
image: family/elasticsearch-ubuntu-2404
247247
machineType: n2-standard-8
248248
buildDirectory: /dev/shm/bk
249-
if: build.branch == "main" || build.branch == "9.1" || build.branch == "9.0" || build.branch == "8.19" || build.branch == "8.18" || build.branch == "7.17"
249+
if: build.branch =~ /^(main|\d+\.\d+|\d+\.x)$/
250250
- label: check-branch-consistency
251251
command: .ci/scripts/run-gradle.sh branchConsistency
252252
timeout_in_minutes: 15

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ steps:
344344
- signal_reason: agent_stop
345345
limit: 3
346346

347-
- label: 8.18.6 / bwc
348-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.6#bwcTest
347+
- label: 8.18.7 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.7#bwcTest
349349
timeout_in_minutes: 300
350350
agents:
351351
provider: gcp
@@ -354,7 +354,7 @@ steps:
354354
buildDirectory: /dev/shm/bk
355355
preemptible: true
356356
env:
357-
BWC_VERSION: 8.18.6
357+
BWC_VERSION: 8.18.7
358358
retry:
359359
automatic:
360360
- exit_status: "-1"
@@ -363,8 +363,8 @@ steps:
363363
- signal_reason: agent_stop
364364
limit: 3
365365

366-
- label: 8.19.3 / bwc
367-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.3#bwcTest
366+
- label: 8.19.4 / bwc
367+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.4#bwcTest
368368
timeout_in_minutes: 300
369369
agents:
370370
provider: gcp
@@ -373,7 +373,7 @@ steps:
373373
buildDirectory: /dev/shm/bk
374374
preemptible: true
375375
env:
376-
BWC_VERSION: 8.19.3
376+
BWC_VERSION: 8.19.4
377377
retry:
378378
automatic:
379379
- exit_status: "-1"
@@ -382,8 +382,8 @@ steps:
382382
- signal_reason: agent_stop
383383
limit: 3
384384

385-
- label: 9.0.6 / bwc
386-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.6#bwcTest
385+
- label: 9.0.7 / bwc
386+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.7#bwcTest
387387
timeout_in_minutes: 300
388388
agents:
389389
provider: gcp
@@ -392,7 +392,7 @@ steps:
392392
buildDirectory: /dev/shm/bk
393393
preemptible: true
394394
env:
395-
BWC_VERSION: 9.0.6
395+
BWC_VERSION: 9.0.7
396396
retry:
397397
automatic:
398398
- exit_status: "-1"
@@ -401,8 +401,8 @@ steps:
401401
- signal_reason: agent_stop
402402
limit: 3
403403

404-
- label: 9.1.3 / bwc
405-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.3#bwcTest
404+
- label: 9.1.4 / bwc
405+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.4#bwcTest
406406
timeout_in_minutes: 300
407407
agents:
408408
provider: gcp
@@ -411,7 +411,7 @@ steps:
411411
buildDirectory: /dev/shm/bk
412412
preemptible: true
413413
env:
414-
BWC_VERSION: 9.1.3
414+
BWC_VERSION: 9.1.4
415415
retry:
416416
automatic:
417417
- exit_status: "-1"
@@ -487,7 +487,7 @@ steps:
487487
setup:
488488
ES_RUNTIME_JAVA:
489489
- openjdk21
490-
BWC_VERSION: ["8.18.6", "8.19.3", "9.0.6", "9.1.3"]
490+
BWC_VERSION: ["8.18.7", "8.19.4", "9.0.7", "9.1.4"]
491491
agents:
492492
provider: gcp
493493
image: family/elasticsearch-ubuntu-2404
@@ -531,7 +531,7 @@ steps:
531531
ES_RUNTIME_JAVA:
532532
- openjdk21
533533
- openjdk23
534-
BWC_VERSION: ["8.18.6", "8.19.3", "9.0.6", "9.1.3"]
534+
BWC_VERSION: ["8.18.7", "8.19.4", "9.0.7", "9.1.4"]
535535
agents:
536536
provider: gcp
537537
image: family/elasticsearch-ubuntu-2404
@@ -665,7 +665,7 @@ steps:
665665
image: family/elasticsearch-ubuntu-2404
666666
machineType: n2-standard-8
667667
buildDirectory: /dev/shm/bk
668-
if: build.branch == "main" || build.branch == "9.1" || build.branch == "9.0" || build.branch == "8.19" || build.branch == "8.18" || build.branch == "7.17"
668+
if: build.branch =~ /^(main|\d+\.\d+|\d+\.x)$/
669669
- label: check-branch-consistency
670670
command: .ci/scripts/run-gradle.sh branchConsistency
671671
timeout_in_minutes: 15

‎.ci/bwcVersions‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BWC_VERSION:
1717
- "8.15.5"
1818
- "8.16.6"
1919
- "8.17.10"
20-
- "8.18.6"
21-
- "8.19.3"
22-
- "9.0.6"
23-
- "9.1.3"
20+
- "8.18.7"
21+
- "8.19.4"
22+
- "9.0.7"
23+
- "9.1.4"

‎.ci/snapshotBwcVersions‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BWC_VERSION:
2-
- "8.18.6"
3-
- "8.19.3"
4-
- "9.0.6"
5-
- "9.1.3"
2+
- "8.18.7"
3+
- "8.19.4"
4+
- "9.0.7"
5+
- "9.1.4"

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionValidationFuncTest.groovy‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,10 +223,33 @@ class TransportVersionValidationFuncTest extends AbstractTransportVersionFuncTes
223223

224224
def "unreferable definitions can have primary ids that are patches"() {
225225
given:
226-
unreferableTransportVersion("initial_10.0.1", "10000001")
226+
unreferableTransportVersion("initial_7.0.1", "7000001")
227227
when:
228228
def result = gradleRunner(":myserver:validateTransportVersionResources").build()
229229
then:
230230
result.task(":myserver:validateTransportVersionResources").outcome == TaskOutcome.SUCCESS
231231
}
232+
233+
def "highest id in an referable definition should exist in an upper bounds file"() {
234+
given:
235+
referableAndReferencedTransportVersion("some_tv", "10000000")
236+
when:
237+
def result = validateResourcesFails()
238+
then:
239+
assertValidateResourcesFailure(result, "Transport version definition file " +
240+
"[myserver/src/main/resources/transport/definitions/referable/some_tv.csv] " +
241+
"has the highest transport version id [10000000] but is not present in any upper bounds files")
242+
}
243+
244+
def "highest id in an unreferable definition should exist in an upper bounds file"() {
245+
given:
246+
unreferableTransportVersion("initial_10.0.0", "10000000")
247+
when:
248+
def result = validateResourcesFails()
249+
then:
250+
// TODO: this should be _unreferable_ in the error message, but will require some rework
251+
assertValidateResourcesFailure(result, "Transport version definition file " +
252+
"[myserver/src/main/resources/transport/definitions/referable/initial_10.0.0.csv] " +
253+
"has the highest transport version id [10000000] but is not present in any upper bounds files")
254+
}
232255
}

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionResourcesTask.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ public void validateTransportVersions() throws IOException {
8383
for (var upperBound : upperBounds.values()) {
8484
validateUpperBound(upperBound, allDefinitions, idsByBase);
8585
}
86+
87+
validateLargestIdIsUsed(upperBounds, allDefinitions);
8688
}
8789

8890
private Map<String, TransportVersionDefinition> collectAllDefinitions(
@@ -253,6 +255,27 @@ private void validateBase(int base, List<IdAndDefinition> ids) {
253255
}
254256
}
255257

258+
private void validateLargestIdIsUsed(
259+
Map<String, TransportVersionUpperBound> upperBounds,
260+
Map<String, TransportVersionDefinition> allDefinitions
261+
) {
262+
// first id is always the highest within a definition, and validated earlier
263+
// note we use min instead of max because the id comparator is in descending order
264+
var highestDefinition = allDefinitions.values().stream().min(Comparator.comparing(d -> d.ids().get(0))).get();
265+
var highestId = highestDefinition.ids().get(0);
266+
267+
for (var upperBound : upperBounds.values()) {
268+
if (upperBound.id().equals(highestId)) {
269+
return;
270+
}
271+
}
272+
273+
throwDefinitionFailure(
274+
highestDefinition,
275+
"has the highest transport version id [" + highestId + "] but is not present in any upper bounds files"
276+
);
277+
}
278+
256279
private void throwDefinitionFailure(TransportVersionDefinition definition, String message) {
257280
Path relativePath = getResources().get().getReferableDefinitionRepositoryPath(definition);
258281
throw new IllegalStateException("Transport version definition file [" + relativePath + "] " + message);

0 commit comments

Comments
 (0)