Merge branch 'main' into feature/list_query_api

Author: GalLalouche

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

@@ -16,6 +16,7 @@
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.testing.Test;
 
+import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
@@ -26,21 +27,22 @@ public class MutedTestPlugin implements Plugin<Project> {
 
  @Override
  public void apply(Project project) {
+ project.getRootProject().getPlugins().apply(GlobalBuildInfoPlugin.class);
+ var buildParams = loadBuildParams(project).get();
+
+ File settingsRoot = project.getLayout().getSettingsDirectory().getAsFile();
  String additionalFilePaths = project.hasProperty(ADDITIONAL_FILES_PROPERTY)
  ? project.property(ADDITIONAL_FILES_PROPERTY).toString()
  : "";
  List<RegularFile> additionalFiles = Arrays.stream(additionalFilePaths.split(","))
  .filter(p -> p.isEmpty() == false)
- .map(p -> project.getRootProject().getLayout().getProjectDirectory().file(p))
+ .map(p -> project.getLayout().getSettingsDirectory().file(p))
  .toList();
 
- project.getRootProject().getPlugins().apply(GlobalBuildInfoPlugin.class);
- var buildParams = loadBuildParams(project).get();
-
  Provider<MutedTestsBuildService> mutedTestsProvider = project.getGradle()
  .getSharedServices()
  .registerIfAbsent("mutedTests", MutedTestsBuildService.class, spec -> {
- spec.getParameters().getInfoPath().set(project.getRootProject().getProjectDir());
+ spec.getParameters().getInfoPath().set(settingsRoot);
  spec.getParameters().getAdditionalFiles().set(additionalFiles);
  });
 

distribution/docker/build.gradle

@@ -316,7 +316,7 @@ void addBuildDockerContextTask(Architecture architecture, DockerBase base) {
  from configurations.fips
  }
  into("resources") {
- from tasks.named('fipsResources')
+ from tasks.named('fipsDockerResources')
  }
  }
  }
@@ -536,9 +536,9 @@ void addBuildCloudDockerImageTasks(Architecture architecture) {
 }
 
 // fips
-TaskProvider<ExportElasticsearchBuildResourcesTask> fipsResourcesTask = tasks.register('fipsResources', ExportElasticsearchBuildResourcesTask)
+TaskProvider<ExportElasticsearchBuildResourcesTask> fipsResourcesTask = tasks.register('fipsDockerResources', ExportElasticsearchBuildResourcesTask)
 fipsResourcesTask.configure {
- outputDir = project.layout.buildDirectory.dir('fips-resources').get().asFile
+ outputDir = project.layout.buildDirectory.dir('fips-docker-resources').get().asFile
  copy 'fips_java.security'
  copy 'fips_java.policy'
 }

docs/changelog/125404.yaml

@@ -0,0 +1,5 @@
+pr: 125404
+summary: Check if the anomaly results index has been rolled over
+area: Machine Learning
+type: upgrade
+issues: []

docs/changelog/125659.yaml

@@ -0,0 +1,6 @@
+pr: 125659
+summary: Non existing synonyms sets do not fail shard recovery for indices
+area: "Analysis"
+type: bug
+issues:
+ - 125603

docs/changelog/125666.yaml

@@ -0,0 +1,5 @@
+pr: 125666
+summary: Minor-Fixes Support 7x segments as archive in 8x / 9x
+area: Search
+type: bug
+issues: []

modules/analysis-common/src/main/java/org/elasticsearch/analysis/common/SynonymTokenFilterFactory.java

@@ -72,7 +72,7 @@ public ReaderWithOrigin getRulesReader(SynonymTokenFilterFactory factory, IndexC
  );
  } else {
  reader = new ReaderWithOrigin(
- Analysis.getReaderFromIndex(synonymsSet, factory.synonymsManagementAPIService),
+ Analysis.getReaderFromIndex(synonymsSet, factory.synonymsManagementAPIService, factory.lenient),
  "[" + synonymsSet + "] synonyms_set in .synonyms index",
  synonymsSet
  );

modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamAutoshardingIT.java

@@ -527,7 +527,7 @@ private static ShardStats getShardStats(IndexMetadata indexMeta, int shardIndex,
  CommonStats stats = new CommonStats();
  stats.docs = new DocsStats(100, 0, randomByteSizeValue().getBytes());
  stats.store = new StoreStats();
- stats.indexing = new IndexingStats(new IndexingStats.Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, false, 1, targetWriteLoad, 1, 0.123));
+ stats.indexing = new IndexingStats(new IndexingStats.Stats(1, 1, 1, 1, 1, 1, 1, 1, 1, false, 1, targetWriteLoad, 1, 0.123, 0.234));
  return new ShardStats(shardRouting, new ShardPath(false, path, path, shardId), stats, null, null, null, false, 0);
  }
 

muted-tests.yml

@@ -245,16 +245,12 @@ tests:
 - class: org.elasticsearch.action.admin.cluster.node.tasks.CancellableTasksIT
  method: testChildrenTasksCancelledOnTimeout
  issue: https://github.com/elastic/elasticsearch/issues/123568
-- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
- method: test {p0=search.vectors/41_knn_search_bbq_hnsw/Test knn search}
- issue: https://github.com/elastic/elasticsearch/issues/123727
 - class: org.elasticsearch.xpack.downsample.DataStreamLifecycleDownsampleDisruptionIT
  method: testDataStreamLifecycleDownsampleRollingRestart
  issue: https://github.com/elastic/elasticsearch/issues/123769
 - class: org.elasticsearch.xpack.searchablesnapshots.FrozenSearchableSnapshotsIntegTests
  method: testCreateAndRestorePartialSearchableSnapshot
  issue: https://github.com/elastic/elasticsearch/issues/123773
-
 - class: org.elasticsearch.xpack.test.rest.XPackRestIT
  method: test {p0=snapshot/10_basic/Create a source only snapshot and then restore it}
  issue: https://github.com/elastic/elasticsearch/issues/122755
@@ -318,9 +314,6 @@ tests:
 - class: org.elasticsearch.common.metrics.ExponentiallyWeightedMovingRateTests
  method: testEwmr_threadSafe
  issue: https://github.com/elastic/elasticsearch/issues/124692
-- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
- method: test {p0=search.vectors/41_knn_search_bbq_hnsw/Test knn search}
- issue: https://github.com/elastic/elasticsearch/issues/124848
 - class: org.elasticsearch.packaging.test.BootstrapCheckTests
  method: test20RunWithBootstrapChecks
  issue: https://github.com/elastic/elasticsearch/issues/124940
@@ -354,9 +347,6 @@ tests:
 - class: org.elasticsearch.index.shard.StoreRecoveryTests
  method: testAddIndices
  issue: https://github.com/elastic/elasticsearch/issues/124104
-- class: org.elasticsearch.xpack.esql.parser.StatementParserTests
- method: testInvalidJoinPatterns
- issue: https://github.com/elastic/elasticsearch/issues/125536
 - class: org.elasticsearch.xpack.inference.registry.ModelRegistryMetadataTests
  method: testUpgrade
  issue: https://github.com/elastic/elasticsearch/issues/125554
@@ -396,6 +386,9 @@ tests:
 - class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT
  method: test {yaml=cat.allocation/10_basic/Node forecasts}
  issue: https://github.com/elastic/elasticsearch/issues/125661
+- class: org.elasticsearch.xpack.esql.spatial.SpatialExtentAggregationNoLicenseIT
+ method: testStExtentAggregationWithPoints
+ issue: https://github.com/elastic/elasticsearch/issues/125735
 
 # Examples:
 #

qa/mixed-cluster/build.gradle

@@ -70,9 +70,6 @@ excludeList.add('aggregations/percentiles_hdr_metric/Negative values test')
 // sync_id is removed in 9.0
 excludeList.add("cat.shards/10_basic/Help")
 
-// Can't work until auto-expand replicas is 0-1 for synonyms index
-excludeList.add("synonyms/90_synonyms_reloading_for_synset/Reload analyzers for specific synonym set")
-
 def clusterPath = getPath()
 
 buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->

rest-api-spec/build.gradle

@@ -88,4 +88,5 @@ tasks.named("yamlRestCompatTestTransform").configure ({ task ->
  task.skipTest("indices.create/21_synthetic_source_stored/field param - keep nested array", "Synthetic source keep arrays now stores leaf arrays natively")
  task.skipTest("indices.create/21_synthetic_source_stored/field param - keep root array", "Synthetic source keep arrays now stores leaf arrays natively")
  task.skipTest("cluster.info/30_info_thread_pool/Cluster HTTP Info", "The search_throttled thread pool has been removed")
+ task.skipTest("synonyms/80_synonyms_from_index/Fail loading synonyms from index if synonyms_set doesn't exist", "Synonyms do no longer fail if the synonyms_set doesn't exist")
 })