Skip to content

Commit c3b3e2b

Browse files
kkrik-eskkrik-es
authored
Merge branch 'main' into tsdb/bulk-load-float
2 parents 37b6128 + eb75ba3 commit c3b3e2b

File tree

96 files changed

+1877
-1474
lines changed

Some content is hidden

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

96 files changed

+1877
-1474
lines changed

‎distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:173cd032e2a8b194c04e08f605b40c743cc52f8eb4ecfc9c5e3280ae97c119b4 AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:d9382de1615bfd6fe66348a9c80258c63fa311b1f583a607addde8ec5bf0f343 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -103,7 +103,7 @@ WORKDIR /usr/share/elasticsearch/config
103103
# Add entrypoint
104104
################################################################################
105105

106-
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:173cd032e2a8b194c04e08f605b40c743cc52f8eb4ecfc9c5e3280ae97c119b4
106+
FROM docker.elastic.co/wolfi/chainguard-base-fips:latest@sha256:d9382de1615bfd6fe66348a9c80258c63fa311b1f583a607addde8ec5bf0f343
107107

108108
RUN <%= retry.loop(package_manager,
109109
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎distribution/docker/src/docker/dockerfiles/wolfi/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# Extract Elasticsearch artifact
2525
################################################################################
2626
27-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:45d6016686787642209440ee29f410a125d2392e6752701cb9960f0ac0c80c1d AS builder
27+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:4dbe94045c967ec89afcee3727cfb746820bd3f699bbbb621e529bde1ce122b1 AS builder
2828
2929
# Install required packages to extract the Elasticsearch distribution
3030
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
@@ -79,7 +79,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
7979
# Add entrypoint
8080
################################################################################
8181

82-
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:45d6016686787642209440ee29f410a125d2392e6752701cb9960f0ac0c80c1d
82+
FROM docker.elastic.co/wolfi/chainguard-base:latest@sha256:4dbe94045c967ec89afcee3727cfb746820bd3f699bbbb621e529bde1ce122b1
8383

8484
RUN <%= retry.loop(package_manager,
8585
"export DEBIAN_FRONTEND=noninteractive && \n" +

‎docs/changelog/132536.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 132536
2+
summary: Avoid stack overflow in `IndicesClusterStateService` `applyClusterState`
3+
area: Cluster Coordination
4+
type: bug
5+
issues: []

‎docs/changelog/133080.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 133080
2+
summary: "Disallow creating `semantic_text` fields in indices created prior to 8.11.0"
3+
area: Relevance
4+
type: bug
5+
issues: []

‎docs/changelog/133403.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 133403
2+
summary: Fix service destination template file name
3+
area: Data streams
4+
type: bug
5+
issues: []

‎modules/repository-s3/src/yamlRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3ClientYamlTestSuiteIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class RepositoryS3ClientYamlTestSuiteIT extends AbstractRepositoryS3Clien
5252

5353
@ParametersFactory
5454
public static Iterable<Object[]> parameters() throws Exception {
55-
return createParameters(new String[] { "repository_s3/10_basic", "repository_s3/20_repository_permanent_credentials" });
55+
return createParameters("repository_s3/10_basic", "repository_s3/20_repository_permanent_credentials");
5656
}
5757

5858
public RepositoryS3ClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

‎modules/repository-s3/src/yamlRestTest/java/org/elasticsearch/repositories/s3/RepositoryS3RegionalStsClientYamlTestSuiteIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static Iterable<Object[]> parameters() throws Exception {
3737
// Run just the basic sanity test to make sure ES starts up and loads the S3 repository with a regional endpoint without an error.
3838
// It would be great to make actual requests against a test fixture, but setting the region means using a production endpoint.
3939
// See #102230 for more details.
40-
return createParameters(new String[] { "repository_s3/10_basic" });
40+
return createParameters("repository_s3/10_basic");
4141
}
4242

4343
public RepositoryS3RegionalStsClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {

‎muted-tests.yml‎

Lines changed: 30 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -489,21 +489,12 @@ tests:
489489
- class: org.elasticsearch.search.CCSDuelIT
490490
method: testTermsAggsWithProfile
491491
issue: https://github.com/elastic/elasticsearch/issues/132880
492-
- class: org.elasticsearch.index.mapper.LongFieldMapperTests
493-
method: testFetchMany
494-
issue: https://github.com/elastic/elasticsearch/issues/132948
495-
- class: org.elasticsearch.index.mapper.LongFieldMapperTests
496-
method: testFetch
497-
issue: https://github.com/elastic/elasticsearch/issues/132956
498492
- class: org.elasticsearch.cluster.ClusterInfoServiceIT
499493
method: testMaxQueueLatenciesInClusterInfo
500494
issue: https://github.com/elastic/elasticsearch/issues/132957
501495
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
502496
method: test {p0=search/400_synthetic_source/_doc_count}
503497
issue: https://github.com/elastic/elasticsearch/issues/132965
504-
- class: org.elasticsearch.index.mapper.LongFieldMapperTests
505-
method: testSyntheticSourceWithTranslogSnapshot
506-
issue: https://github.com/elastic/elasticsearch/issues/132964
507498
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
508499
method: test {p0=search/160_exists_query/Test exists query on unmapped float field}
509500
issue: https://github.com/elastic/elasticsearch/issues/132984
@@ -594,15 +585,9 @@ tests:
594585
- class: org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT
595586
method: testCCSClusterDetailsWhereAllShardsSkippedInCanMatch
596587
issue: https://github.com/elastic/elasticsearch/issues/133370
597-
- class: org.elasticsearch.index.mapper.LongFieldMapperTests
598-
method: testSyntheticSourceMany
599-
issue: https://github.com/elastic/elasticsearch/issues/133394
600588
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
601589
method: test {p0=search.vectors/42_knn_search_int4_flat/kNN search with filter}
602590
issue: https://github.com/elastic/elasticsearch/issues/133420
603-
- class: org.elasticsearch.index.mapper.LongFieldMapperTests
604-
method: testSyntheticSourceInNestedObject
605-
issue: https://github.com/elastic/elasticsearch/issues/133426
606591
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
607592
method: test {p0=search/160_exists_query/Test exists query on date field in empty index}
608593
issue: https://github.com/elastic/elasticsearch/issues/133439
@@ -627,66 +612,51 @@ tests:
627612
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT
628613
method: testStopQueryLocal
629614
issue: https://github.com/elastic/elasticsearch/issues/133481
630-
- class: org.elasticsearch.index.mapper.LongFieldMapperTests
631-
method: testSyntheticSource
632-
issue: https://github.com/elastic/elasticsearch/issues/133496
633-
- class: org.elasticsearch.xpack.logsdb.qa.StandardVersusStandardReindexedIntoLogsDbChallengeRestIT
634-
method: testEsqlSource
635-
issue: https://github.com/elastic/elasticsearch/issues/132601
636-
- class: org.elasticsearch.xpack.logsdb.qa.BulkChallengeRestIT
637-
method: testEsqlSource
638-
issue: https://github.com/elastic/elasticsearch/issues/132600
639-
- class: org.elasticsearch.xpack.logsdb.qa.StoredSourceLogsDbVersusReindexedLogsDbChallengeRestIT
640-
method: testEsqlSource
641-
issue: https://github.com/elastic/elasticsearch/issues/132602
642-
- class: org.elasticsearch.xpack.logsdb.qa.BulkChallengeRestIT
643-
method: testMatchAllQuery
644-
issue: https://github.com/elastic/elasticsearch/issues/133497
645-
- class: org.elasticsearch.xpack.logsdb.qa.StandardVersusStandardReindexedIntoLogsDbChallengeRestIT
646-
method: testMatchAllQuery
647-
issue: https://github.com/elastic/elasticsearch/issues/133498
648-
- class: org.elasticsearch.xpack.logsdb.qa.StoredSourceLogsDbVersusReindexedLogsDbChallengeRestIT
649-
method: testMatchAllQuery
650-
issue: https://github.com/elastic/elasticsearch/issues/133499
651-
- class: org.elasticsearch.xpack.logsdb.qa.BulkChallengeRestIT
652-
method: testRandomQueries
653-
issue: https://github.com/elastic/elasticsearch/issues/133503
654-
- class: org.elasticsearch.xpack.logsdb.qa.StandardVersusStandardReindexedIntoLogsDbChallengeRestIT
655-
method: testRandomQueries
656-
issue: https://github.com/elastic/elasticsearch/issues/133504
657-
- class: org.elasticsearch.xpack.logsdb.qa.StoredSourceLogsDbVersusReindexedLogsDbChallengeRestIT
658-
method: testRandomQueries
659-
issue: https://github.com/elastic/elasticsearch/issues/133505
660615
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
661616
method: test {csv-spec:spatial.ConvertFromStringParseError}
662617
issue: https://github.com/elastic/elasticsearch/issues/133507
663618
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
664619
method: test {p0=search.vectors/90_sparse_vector/Indexing and searching multi-value sparse vectors in >=8.15}
665620
issue: https://github.com/elastic/elasticsearch/issues/133508
666-
- class: org.elasticsearch.xpack.logsdb.qa.BulkChallengeRestIT
667-
method: testTermsQuery
668-
issue: https://github.com/elastic/elasticsearch/issues/133516
669-
- class: org.elasticsearch.xpack.logsdb.qa.StandardVersusStandardReindexedIntoLogsDbChallengeRestIT
670-
method: testTermsQuery
671-
issue: https://github.com/elastic/elasticsearch/issues/133517
672-
- class: org.elasticsearch.xpack.logsdb.qa.StoredSourceLogsDbVersusReindexedLogsDbChallengeRestIT
673-
method: testTermsQuery
674-
issue: https://github.com/elastic/elasticsearch/issues/133518
675-
- class: org.elasticsearch.xpack.logsdb.qa.LogsDbVersusReindexedLogsDbChallengeRestIT
676-
method: testEsqlSource
677-
issue: https://github.com/elastic/elasticsearch/issues/133520
678621
- class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
679622
method: testTopNPushedToLucene
680623
issue: https://github.com/elastic/elasticsearch/issues/133556
681624
- class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
682625
method: testFilterNestedFields
683626
issue: https://github.com/elastic/elasticsearch/issues/133557
684-
- class: org.elasticsearch.xpack.logsdb.qa.LogsDbVersusReindexedLogsDbChallengeRestIT
685-
method: testMatchAllQuery
686-
issue: https://github.com/elastic/elasticsearch/issues/133560
687627
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
688628
method: test {p0=search/10_source_filtering/no filtering}
689629
issue: https://github.com/elastic/elasticsearch/issues/133561
630+
- class: org.elasticsearch.compute.lucene.LuceneTopNSourceOperatorTests
631+
method: testShardDataPartitioning
632+
issue: https://github.com/elastic/elasticsearch/issues/133574
633+
- class: org.elasticsearch.compute.data.BasicBlockTests
634+
method: testIntBlock
635+
issue: https://github.com/elastic/elasticsearch/issues/133596
636+
- class: org.elasticsearch.xpack.logsdb.patternedtext.PatternedTextFieldMapperTests
637+
method: testSyntheticSourceMany
638+
issue: https://github.com/elastic/elasticsearch/issues/133598
639+
- class: org.elasticsearch.compute.lucene.LuceneTopNSourceOperatorTests
640+
method: testWithCranky
641+
issue: https://github.com/elastic/elasticsearch/issues/133600
642+
- class: org.elasticsearch.compute.data.BasicBlockTests
643+
method: testDoubleBlock
644+
issue: https://github.com/elastic/elasticsearch/issues/133606
645+
- class: org.elasticsearch.compute.lucene.LuceneTopNSourceOperatorTests
646+
method: testShardDataPartitioningWithCranky
647+
issue: https://github.com/elastic/elasticsearch/issues/133607
648+
- class: org.elasticsearch.compute.data.BasicBlockTests
649+
method: testBooleanBlock
650+
issue: https://github.com/elastic/elasticsearch/issues/133608
651+
- class: org.elasticsearch.compute.data.BasicBlockTests
652+
method: testLongBlock
653+
issue: https://github.com/elastic/elasticsearch/issues/133618
654+
- class: org.elasticsearch.xpack.esql.inference.rerank.RerankOperatorTests
655+
method: testSimpleCircuitBreaking
656+
issue: https://github.com/elastic/elasticsearch/issues/133619
657+
- class: org.elasticsearch.compute.data.BasicBlockTests
658+
method: testFloatBlock
659+
issue: https://github.com/elastic/elasticsearch/issues/133621
690660

691661
# Examples:
692662
#

‎plugins/repository-hdfs/src/yamlRestTest/java/org/elasticsearch/repositories/hdfs/RepositoryHdfsClientYamlTestSuiteIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ protected String getTestRestCluster() {
5252

5353
@ParametersFactory
5454
public static Iterable<Object[]> parameters() throws Exception {
55-
return createParameters(new String[] { "hdfs_repository" }, Map.of("hdfs_port", hdfsFixture.getPort()));
55+
return createParameters(Map.of("hdfs_port", hdfsFixture.getPort()), "hdfs_repository");
5656
}
5757
}

‎plugins/repository-hdfs/src/yamlRestTest/java/org/elasticsearch/repositories/hdfs/SecureRepositoryHdfsClientYamlTestSuiteIT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ protected String getTestRestCluster() {
5858

5959
@ParametersFactory
6060
public static Iterable<Object[]> parameters() throws Exception {
61-
return createParameters(new String[] { "secure_hdfs_repository" }, Map.of("secure_hdfs_port", hdfsFixture.getPort()));
61+
return createParameters(Map.of("secure_hdfs_port", hdfsFixture.getPort()), "secure_hdfs_repository");
6262
}
6363
}

0 commit comments

Comments
 (0)