Skip to content

Commit 8994da2

Browse files
Merge branch 'main' into svilen/130306
2 parents 14df560 + e2ec28d commit 8994da2

File tree

52 files changed

+1696
-248
lines changed

Some content is hidden

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

52 files changed

+1696
-248
lines changed

README.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ For the complete Elasticsearch documentation visit
275275
https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html[elastic.co].
276276

277277
For information about our documentation processes, see the
278-
xref:docs/README.asciidoc[docs README].
278+
xref:https://github.com/elastic/elasticsearch/blob/main/docs/README.md[docs README].
279279

280280
[[examples]]
281281
== Examples and guides

docs/changelog/129013.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
pr: 129013
2+
summary: "Add remote index support to LOOKUP JOIN"
3+
area: ES|QL
4+
type: feature
5+
issues: [ ]
6+
highlight:
7+
title: Add remote index support to LOOKUP JOIN
8+
body: |-
9+
Queries containing LOOKUP JOIN now can be preformed on cross-cluster indices, for example:
10+
[source,yaml]
11+
----------------------------
12+
FROM logs-*, remote:logs-* | LOOKUP JOIN clients on ip | SORT timestamp | LIMIT 100
13+
----------------------------

docs/changelog/130593.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130593
2+
summary: Add new `CachePopulationReason`
3+
area: Store
4+
type: enhancement
5+
issues: []

docs/changelog/130776.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 130776
2+
summary: Fix msearch request parsing when index expression is null
3+
area: Search
4+
type: bug
5+
issues:
6+
- 129631

docs/reference/search-connectors/elastic-managed-connectors.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
applies_to:
3-
ess: discontinued 9.0.0
3+
ess: removed 9.0.0
44
mapped_pages:
55
- https://www.elastic.co/guide/en/elasticsearch/reference/current/es-native-connectors.html
66
---

muted-tests.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,6 @@ tests:
492492
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
493493
method: test {lookup-join.MvJoinKeyOnFrom SYNC}
494494
issue: https://github.com/elastic/elasticsearch/issues/130296
495-
- class: org.elasticsearch.ingest.PipelineFactoryTests
496-
method: testCreateUnsupportedFieldAccessPattern
497-
issue: https://github.com/elastic/elasticsearch/issues/130422
498495
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
499496
method: test {p0=msearch/20_typed_keys/Multisearch test with typed_keys parameter for sampler and significant terms}
500497
issue: https://github.com/elastic/elasticsearch/issues/130472
@@ -555,9 +552,6 @@ tests:
555552
- class: org.elasticsearch.xpack.esql.action.EsqlRemoteErrorWrapIT
556553
method: testThatRemoteErrorsAreWrapped
557554
issue: https://github.com/elastic/elasticsearch/issues/130794
558-
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
559-
method: test {ints.InCast SYNC}
560-
issue: https://github.com/elastic/elasticsearch/issues/130796
561555
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
562556
method: test {p0=mtermvectors/10_basic/Tests catching other exceptions per item}
563557
issue: https://github.com/elastic/elasticsearch/issues/122414
@@ -567,9 +561,12 @@ tests:
567561
- class: org.elasticsearch.cluster.ClusterStateSerializationTests
568562
method: testSerializationPreMultiProject
569563
issue: https://github.com/elastic/elasticsearch/issues/130872
570-
- class: org.elasticsearch.cluster.coordination.votingonly.VotingOnlyNodePluginTests
571-
method: testPreferFullMasterOverVotingOnlyNodes
572-
issue: https://github.com/elastic/elasticsearch/issues/130883
564+
- class: org.elasticsearch.search.SearchWithRejectionsIT
565+
method: testOpenContextsAfterRejections
566+
issue: https://github.com/elastic/elasticsearch/issues/130821
567+
- class: org.elasticsearch.packaging.test.DockerTests
568+
method: test082CannotUseEnvVarsAndFiles
569+
issue: https://github.com/elastic/elasticsearch/issues/129808
573570

574571
# Examples:
575572
#

qa/mixed-cluster/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ buildParams.bwcVersions.withWireCompatible { bwcVersion, baseName ->
8989
setting 'health.master_history.no_master_transitions_threshold', '10'
9090
}
9191
requiresFeature 'es.index_mode_feature_flag_registered', Version.fromString("8.0.0")
92+
requiresFeature 'sub_objects_auto', Version.fromString("8.16.0")
9293
if (bwcVersion.before(Version.fromString("8.18.0"))) {
9394
jvmArgs '-da:org.elasticsearch.index.mapper.DocumentMapper'
9495
jvmArgs '-da:org.elasticsearch.index.mapper.MapperService'

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ static TransportVersion def(int id) {
336336
public static final TransportVersion ESQL_LOCAL_RELATION_WITH_NEW_BLOCKS = def(9_117_0_00);
337337
public static final TransportVersion ML_INFERENCE_CUSTOM_SERVICE_EMBEDDING_TYPE = def(9_118_0_00);
338338
public static final TransportVersion ESQL_FIXED_INDEX_LIKE = def(9_119_0_00);
339+
public static final TransportVersion LOOKUP_JOIN_CCS = def(9_120_0_00);
339340

340341
/*
341342
* STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/action/admin/cluster/tasks/PendingClusterTasksResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public String toString() {
4949
.append(pendingClusterTask.getSource())
5050
.append("/")
5151
.append(pendingClusterTask.getTimeInQueue())
52+
.append(pendingClusterTask.executing() ? "[executing]" : "")
5253
.append("\n");
5354
}
5455
return sb.toString();

server/src/main/java/org/elasticsearch/cluster/project/ProjectStateRegistry.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,18 @@ Map<ProjectId, Settings> getProjectsSettings() {
145145
return Collections.unmodifiableMap(projectsSettings);
146146
}
147147

148+
@Override
149+
public String toString() {
150+
return "ProjectStateRegistry["
151+
+ "projectsSettings="
152+
+ projectsSettings
153+
+ ", projectsMarkedForDeletion="
154+
+ projectsMarkedForDeletion
155+
+ ", projectsMarkedForDeletionGeneration="
156+
+ projectsMarkedForDeletionGeneration
157+
+ ']';
158+
}
159+
148160
@Override
149161
public boolean equals(Object o) {
150162
if (this == o) return true;

0 commit comments

Comments
 (0)