Skip to content

Commit 621ec0d

Browse files
martijnvgmartijnvg
committed
Merge remote-tracking branch 'es/main' into mergeSortedNumericField_5
2 parents 6208339 + fd2cc97 commit 621ec0d

File tree

377 files changed

+8333
-3566
lines changed

Some content is hidden

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

377 files changed

+8333
-3566
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
3636
map.put(LegacyRestTestBasePlugin.class, ":qa:remote-clusters");
3737
map.put(LegacyRestTestBasePlugin.class, ":qa:repository-multi-version");
3838
map.put(LegacyRestTestBasePlugin.class, ":qa:rolling-upgrade-legacy");
39-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:core");
4039
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ent-search");
4140
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:fleet");
4241
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:logstash");

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/MutedTestPlugin.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.gradle.api.provider.Provider;
1717
import org.gradle.api.tasks.testing.Test;
1818

19+
import java.io.File;
1920
import java.util.Arrays;
2021
import java.util.List;
2122

@@ -26,21 +27,22 @@ public class MutedTestPlugin implements Plugin<Project> {
2627

2728
@Override
2829
public void apply(Project project) {
30+
project.getRootProject().getPlugins().apply(GlobalBuildInfoPlugin.class);
31+
var buildParams = loadBuildParams(project).get();
32+
33+
File settingsRoot = project.getLayout().getSettingsDirectory().getAsFile();
2934
String additionalFilePaths = project.hasProperty(ADDITIONAL_FILES_PROPERTY)
3035
? project.property(ADDITIONAL_FILES_PROPERTY).toString()
3136
: "";
3237
List<RegularFile> additionalFiles = Arrays.stream(additionalFilePaths.split(","))
3338
.filter(p -> p.isEmpty() == false)
34-
.map(p -> project.getRootProject().getLayout().getProjectDirectory().file(p))
39+
.map(p -> project.getLayout().getSettingsDirectory().file(p))
3540
.toList();
3641

37-
project.getRootProject().getPlugins().apply(GlobalBuildInfoPlugin.class);
38-
var buildParams = loadBuildParams(project).get();
39-
4042
Provider<MutedTestsBuildService> mutedTestsProvider = project.getGradle()
4143
.getSharedServices()
4244
.registerIfAbsent("mutedTests", MutedTestsBuildService.class, spec -> {
43-
spec.getParameters().getInfoPath().set(project.getRootProject().getProjectDir());
45+
spec.getParameters().getInfoPath().set(settingsRoot);
4446
spec.getParameters().getAdditionalFiles().set(additionalFiles);
4547
});
4648

‎distribution/docker/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ void addBuildDockerContextTask(Architecture architecture, DockerBase base) {
316316
from configurations.fips
317317
}
318318
into("resources") {
319-
from tasks.named('fipsResources')
319+
from tasks.named('fipsDockerResources')
320320
}
321321
}
322322
}
@@ -536,9 +536,9 @@ void addBuildCloudDockerImageTasks(Architecture architecture) {
536536
}
537537

538538
// fips
539-
TaskProvider<ExportElasticsearchBuildResourcesTask> fipsResourcesTask = tasks.register('fipsResources', ExportElasticsearchBuildResourcesTask)
539+
TaskProvider<ExportElasticsearchBuildResourcesTask> fipsResourcesTask = tasks.register('fipsDockerResources', ExportElasticsearchBuildResourcesTask)
540540
fipsResourcesTask.configure {
541-
outputDir = project.layout.buildDirectory.dir('fips-resources').get().asFile
541+
outputDir = project.layout.buildDirectory.dir('fips-docker-resources').get().asFile
542542
copy 'fips_java.security'
543543
copy 'fips_java.policy'
544544
}

‎docs/changelog/121885.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 121885
2+
summary: Introduce batched query execution and data-node side reduce
3+
area: Search
4+
type: enhancement
5+
issues: []

‎docs/changelog/124062.yaml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎docs/changelog/125191.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 125191
2+
summary: Fix sorting when `aggregate_metric_double` present
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

‎docs/changelog/125404.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 125404
2+
summary: Check if the anomaly results index has been rolled over
3+
area: Machine Learning
4+
type: upgrade
5+
issues: []

‎docs/changelog/125520.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 125520
2+
summary: Add `FailedShardEntry` info to shard-failed task source string
3+
area: Allocation
4+
type: enhancement
5+
issues:
6+
- 102606

‎docs/changelog/125659.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 125659
2+
summary: Non existing synonyms sets do not fail shard recovery for indices
3+
area: "Analysis"
4+
type: bug
5+
issues:
6+
- 125603

‎docs/changelog/125666.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 125666
2+
summary: Minor-Fixes Support 7x segments as archive in 8x / 9x
3+
area: Search
4+
type: bug
5+
issues: []

0 commit comments

Comments
 (0)