Skip to content

Commit 31892e0

Browse files
szybiaszybia
committed
Merge remote-tracking branch 'upstream/main' into security-stats-with-dls
* upstream/main: (55 commits) Mute org.elasticsearch.upgrades.MatchOnlyTextRollingUpgradeIT testIndexing {upgradedNodes=1} elastic#135525 Address es819 tsdb doc values format performance bug (elastic#135505) Remove obsolete --add-opens from JDK API extractor tool (elastic#135445) [CI] Fix MergeWithFailureIT (elastic#135447) Increase wait time in AdaptiveAllocationsScalerServiceTests (elastic#135510) ES|QL: Handle multi values in FUSE (elastic#135448) Mute org.elasticsearch.upgrades.SyntheticSourceRollingUpgradeIT testIndexing {upgradedNodes=1} elastic#135512 Add trust configuration for cross cluster api keys (elastic#134893) ESQL: Fix flakiness in SessionUtilsTests (elastic#135375) Mute org.elasticsearch.upgrades.LogsdbIndexingRollingUpgradeIT testIndexing {upgradedNodes=1} elastic#135511 Mute org.elasticsearch.upgrades.MatchOnlyTextRollingUpgradeIT testIndexing {upgradedNodes=2} elastic#135325 Require all functions to provide examples (elastic#135094) Mute org.elasticsearch.upgrades.SyntheticSourceRollingUpgradeIT testIndexing {upgradedNodes=2} elastic#135344 Mute org.elasticsearch.upgrades.TextRollingUpgradeIT testIndexing {upgradedNodes=1} elastic#135236 Mute org.elasticsearch.upgrades.TextRollingUpgradeIT testIndexing {upgradedNodes=2} elastic#135238 Mute org.elasticsearch.upgrades.LogsdbIndexingRollingUpgradeIT testIndexing {upgradedNodes=2} elastic#135327 Mute org.elasticsearch.upgrades.MatchOnlyTextRollingUpgradeIT testIndexing {upgradedNodes=3} elastic#135324 Mute org.elasticsearch.upgrades.StandardToLogsDbIndexModeRollingUpgradeIT testLogsIndexing {upgradedNodes=3} elastic#135315 ESQL: Handle right hand side of Inline Stats coming optimized with LocalRelation shortcut (elastic#135011) Mute org.elasticsearch.upgrades.TextRollingUpgradeIT testIndexing {upgradedNodes=3} elastic#135237 ...
2 parents 8459878 + aaeca25 commit 31892e0

File tree

340 files changed

+9371
-4606
lines changed

Some content is hidden

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

340 files changed

+9371
-4606
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,13 @@ class ResolveTransportVersionConflictFuncTest extends AbstractTransportVersionFu
8787
assertUpperBound("9.1", "new_tv,8012002")
8888
assertUpperBound("8.19", "new_tv,7123002")
8989
}
90+
91+
def "no new transport version is idempotent"() {
92+
when:
93+
def result = runResolveAndValidateTask().build()
94+
95+
then:
96+
assertResolveAndValidateSuccess(result)
97+
assertUpperBound("9.2", "existing_92,8123000")
98+
}
9099
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
428428

429429
def "upper bounds files must exist for backport branches"() {
430430
when:
431-
def result = runGenerateTask("--backport-branches=9.1,8.13,7.17,6.0").buildAndFail()
431+
def result = runGenerateTask("--name", "new_tv", "--backport-branches=9.1,8.13,7.17,6.0").buildAndFail()
432432

433433
then:
434434
assertGenerateFailure(result, "Missing upper bounds files for branches [6.0, 7.17, 8.13], known branches are [8.19, 9.0, 9.1, 9.2]")

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,4 +294,21 @@ class TransportVersionValidationFuncTest extends AbstractTransportVersionFuncTes
294294
then:
295295
result.task(":myserver:validateTransportVersionResources").outcome == TaskOutcome.SUCCESS
296296
}
297+
298+
def "only current upper bound validated on release branch"() {
299+
given:
300+
file("myserver/build.gradle") << """
301+
tasks.named('validateTransportVersionResources') {
302+
currentUpperBoundName = '9.0'
303+
}
304+
"""
305+
referableAndReferencedTransportVersion("some_tv", "8124000,8012004")
306+
transportVersionUpperBound("9.1", "some_tv", "8012004")
307+
308+
when:
309+
def result = gradleRunner("validateTransportVersionResources").build()
310+
311+
then:
312+
result.task(":myserver:validateTransportVersionResources").outcome == TaskOutcome.SUCCESS
313+
}
297314
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ public void run() throws IOException {
9898
List<String> changedDefinitionNames = resources.getChangedReferableDefinitionNames();
9999
String targetDefinitionName = getTargetDefinitionName(resources, referencedNames, changedDefinitionNames);
100100

101-
List<TransportVersionUpperBound> upstreamUpperBounds = resources.getUpperBoundsFromUpstream();
102-
Set<String> targetUpperBoundNames = getTargetUpperBoundNames(resources, upstreamUpperBounds, targetDefinitionName);
103-
104101
getLogger().lifecycle("Generating transport version name: " + targetDefinitionName);
105102
if (targetDefinitionName.isEmpty()) {
106103
// TODO: resetting upper bounds needs to be done locally, otherwise it pulls in some (incomplete) changes from upstream main
107104
// resetAllUpperBounds(resources);
108105
} else {
106+
List<TransportVersionUpperBound> upstreamUpperBounds = resources.getUpperBoundsFromUpstream();
107+
Set<String> targetUpperBoundNames = getTargetUpperBoundNames(resources, upstreamUpperBounds, targetDefinitionName);
108+
109109
List<TransportVersionId> ids = updateUpperBounds(resources, upstreamUpperBounds, targetUpperBoundNames, targetDefinitionName);
110110
// (Re)write the definition file.
111111
resources.writeDefinition(new TransportVersionDefinition(targetDefinitionName, ids, true));

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public void validateTransportVersions() throws IOException {
8383
Map<String, TransportVersionDefinition> allDefinitions = collectAllDefinitions(referableDefinitions, unreferableDefinitions);
8484
Map<Integer, List<IdAndDefinition>> idsByBase = collectIdsByBase(allDefinitions.values());
8585
Map<String, TransportVersionUpperBound> upperBounds = resources.getUpperBounds();
86+
TransportVersionUpperBound currentUpperBound = upperBounds.get(getCurrentUpperBoundName().get());
8687
boolean onReleaseBranch = checkIfDefinitelyOnReleaseBranch(upperBounds);
8788

8889
for (var definition : referableDefinitions.values()) {
@@ -94,14 +95,21 @@ public void validateTransportVersions() throws IOException {
9495
}
9596

9697
for (var entry : idsByBase.entrySet()) {
97-
validateBase(entry.getKey(), entry.getValue());
98+
int baseId = entry.getKey();
99+
// on main we validate all bases, but on release branches we only validate up to the current upper bound
100+
if (onReleaseBranch == false || baseId <= currentUpperBound.definitionId().base()) {
101+
validateBase(baseId, entry.getValue());
102+
}
98103
}
99104

100-
for (var upperBound : upperBounds.values()) {
101-
validateUpperBound(upperBound, allDefinitions, idsByBase);
102-
}
105+
if (onReleaseBranch) {
106+
// on release branches we only check the current upper bound, others may be inaccurate
107+
validateUpperBound(currentUpperBound, allDefinitions, idsByBase);
108+
} else {
109+
for (var upperBound : upperBounds.values()) {
110+
validateUpperBound(upperBound, allDefinitions, idsByBase);
111+
}
103112

104-
if (onReleaseBranch == false) {
105113
validatePrimaryIds(resources, upperBounds, allDefinitions);
106114
}
107115
}

‎docs/changelog/134585.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 134585
2+
summary: Add classes to represent raw docs sampling configs
3+
area: Ingest Node
4+
type: feature
5+
issues: []

‎docs/changelog/134673.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 134673
2+
summary: Gracefully shutdown model deployment when node is removed from assignment
3+
routing
4+
area: Machine Learning
5+
type: bug
6+
issues: []

‎docs/changelog/134893.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 134893
2+
summary: Add trust configuration for cross cluster api keys
3+
area: Security
4+
type: enhancement
5+
issues: []

‎docs/changelog/134894.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 134894
2+
summary: "[Cyera] Add `manage`, `create_index`, `read`, `index`, `write`, `delete`, permission for third party agent indices `kibana_system`"
3+
area: Authorization
4+
type: enhancement
5+
issues:
6+
- 134183

‎docs/changelog/135011.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 135011
2+
summary: Handle right hand side of Inline Stats coming optimized with `LocalRelation`
3+
shortcut
4+
area: ES|QL
5+
type: bug
6+
issues: []

0 commit comments

Comments
 (0)