Skip to content

Commit 79d5581

Browse files
afoucretafoucret
committed
Merge branch 'main' of https://github.com/elastic/elasticsearch into esql-reranker-boostrap
2 parents 8150a1f + b01438a commit 79d5581

File tree

96 files changed

+1620
-932
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

+1620
-932
lines changed

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractRestResourcesFuncTest.groovy‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,27 @@ package org.elasticsearch.gradle.fixtures;
1313
abstract class AbstractRestResourcesFuncTest extends AbstractGradleFuncTest {
1414

1515
def setup() {
16+
settingsFile.text = """
17+
plugins {
18+
id 'elasticsearch.java-toolchain'
19+
}
20+
21+
toolchainManagement {
22+
jvm {
23+
javaRepositories {
24+
repository('bundledOracleOpendJdk') {
25+
resolverClass = org.elasticsearch.gradle.internal.toolchain.OracleOpenJdkToolchainResolver
26+
}
27+
repository('adoptiumJdks') {
28+
resolverClass = org.elasticsearch.gradle.internal.toolchain.AdoptiumJdkToolchainResolver
29+
}
30+
repository('archivedOracleJdks') {
31+
resolverClass = org.elasticsearch.gradle.internal.toolchain.ArchivedOracleJdkToolchainResolver
32+
}
33+
}
34+
}
35+
}
36+
""" + settingsFile.text
1637
subProject(":test:framework") << "apply plugin: 'elasticsearch.java'"
1738
subProject(":test:test-clusters") << "apply plugin: 'elasticsearch.java'"
1839
subProject(":test:yaml-rest-runner") << "apply plugin: 'elasticsearch.java'"

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
3737
map.put(LegacyRestTestBasePlugin.class, ":qa:repository-multi-version");
3838
map.put(LegacyRestTestBasePlugin.class, ":qa:rolling-upgrade-legacy");
3939
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ent-search");
40-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:fleet");
41-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:logstash");
42-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:vector-tile");
4340
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:mixed-tier-cluster");
4441
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:repository-old-versions");
4542
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:rolling-upgrade");
@@ -61,12 +58,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
6158
map.put(LegacyRestTestBasePlugin.class, ":x-pack:qa:third-party:slack");
6259
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:async-search:qa:rest");
6360
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:autoscaling:qa:rest");
64-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ccr:qa:downgrade-to-basic-license");
65-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ccr:qa:multi-cluster");
66-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ccr:qa:non-compliant-license");
67-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ccr:qa:rest");
68-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ccr:qa:restart");
69-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ccr:qa:security");
7061
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:deprecation:qa:early-deprecation-rest");
7162
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:deprecation:qa:rest");
7263
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:downsample:qa:with-security");
@@ -77,7 +68,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
7768
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:ccs-rolling-upgrade");
7869
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:correctness");
7970
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:eql:qa:mixed-node");
80-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:fleet:qa:rest");
8171
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:identity-provider:qa:idp-rest-tests");
8272
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ilm:qa:multi-cluster");
8373
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:ilm:qa:multi-node");
@@ -94,8 +84,6 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
9484
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:security:qa:tls-basic");
9585
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:shutdown:qa:multi-node");
9686
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:shutdown:qa:rolling-upgrade");
97-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:slm:qa:multi-node");
98-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:slm:qa:rest");
9987
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:snapshot-based-recoveries:qa:fs");
10088
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:snapshot-based-recoveries:qa:license-enforcing");
10189
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:snapshot-repo-test-kit:qa:hdfs");
@@ -108,12 +96,10 @@ private static ListMultimap<Class<?>, String> createLegacyRestTestBasePluginUsag
10896
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:sql:qa:mixed-node");
10997
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:sql:qa:server:security:with-ssl");
11098
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:sql:qa:server:security:without-ssl");
111-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:stack:qa:rest");
11299
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:text-structure:qa:text-structure-with-security");
113100
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:transform:qa:multi-cluster-tests-with-security");
114101
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:transform:qa:multi-node-tests");
115102
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:transform:qa:single-node-tests");
116-
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:vector-tile:qa:multi-cluster");
117103
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:watcher:qa:rest");
118104
map.put(LegacyRestTestBasePlugin.class, ":x-pack:plugin:watcher:qa:with-security");
119105
return map;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,13 @@ public class InternalElasticsearchDistributionTypes {
2121
public static final ElasticsearchDistributionType DOCKER_IRONBANK = new DockerIronBankElasticsearchDistributionType();
2222
public static final ElasticsearchDistributionType DOCKER_CLOUD_ESS = new DockerCloudEssElasticsearchDistributionType();
2323
public static final ElasticsearchDistributionType DOCKER_WOLFI = new DockerWolfiElasticsearchDistributionType();
24-
public static final ElasticsearchDistributionType DOCKER_FIPS = new DockerFipsElasticsearchDistributionType();
2524

2625
public static final List<ElasticsearchDistributionType> ALL_INTERNAL = List.of(
2726
DEB,
2827
RPM,
2928
DOCKER,
3029
DOCKER_IRONBANK,
3130
DOCKER_WOLFI,
32-
DOCKER_CLOUD_ESS,
33-
DOCKER_FIPS
31+
DOCKER_CLOUD_ESS
3432
);
3533
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DEB;
5252
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER;
5353
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_CLOUD_ESS;
54-
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_FIPS;
5554
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_IRONBANK;
5655
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_WOLFI;
5756
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.RPM;
@@ -152,7 +151,6 @@ private static Map<ElasticsearchDistributionType, TaskProvider<?>> lifecycleTask
152151
lifecyleTasks.put(DOCKER_IRONBANK, project.getTasks().register(taskPrefix + ".docker-ironbank"));
153152
lifecyleTasks.put(DOCKER_CLOUD_ESS, project.getTasks().register(taskPrefix + ".docker-cloud-ess"));
154153
lifecyleTasks.put(DOCKER_WOLFI, project.getTasks().register(taskPrefix + ".docker-wolfi"));
155-
lifecyleTasks.put(DOCKER_FIPS, project.getTasks().register(taskPrefix + ".docker-fips"));
156154
lifecyleTasks.put(ARCHIVE, project.getTasks().register(taskPrefix + ".archives"));
157155
lifecyleTasks.put(DEB, project.getTasks().register(taskPrefix + ".packages"));
158156
lifecyleTasks.put(RPM, lifecyleTasks.get(DEB));

‎docs/changelog/125916.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 125916
2+
summary: Re-enable parallel collection for field sorted top hits
3+
area: Search
4+
type: bug
5+
issues: []

‎libs/entitlement/src/main/java/org/elasticsearch/entitlement/initialization/EntitlementInitialization.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
import java.util.stream.StreamSupport;
6969

7070
import static org.elasticsearch.entitlement.runtime.policy.Platform.LINUX;
71+
import static org.elasticsearch.entitlement.runtime.policy.entitlements.FilesEntitlement.BaseDir.CONFIG;
7172
import static org.elasticsearch.entitlement.runtime.policy.entitlements.FilesEntitlement.BaseDir.DATA;
7273
import static org.elasticsearch.entitlement.runtime.policy.entitlements.FilesEntitlement.BaseDir.SHARED_REPO;
7374
import static org.elasticsearch.entitlement.runtime.policy.entitlements.FilesEntitlement.Mode.READ;
@@ -182,7 +183,8 @@ private static PolicyManager createPolicyManager() {
182183
FileData.ofPath(bootstrapArgs.libDir(), READ),
183184
FileData.ofRelativePath(Path.of(""), DATA, READ_WRITE),
184185
FileData.ofRelativePath(Path.of(""), SHARED_REPO, READ_WRITE),
185-
186+
// exclusive settings file
187+
FileData.ofRelativePath(Path.of("operator/settings.json"), CONFIG, READ_WRITE).withExclusive(true),
186188
// OS release on Linux
187189
FileData.ofPath(Path.of("/etc/os-release"), READ).withPlatform(LINUX),
188190
FileData.ofPath(Path.of("/etc/system-release"), READ).withPlatform(LINUX),

‎libs/entitlement/src/main/java/org/elasticsearch/entitlement/instrumentation/Transformer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public byte[] transform(
4646
return instrumenter.instrumentClass(className, classfileBuffer, verifyClasses);
4747
} else {
4848
// System.out.println("Not transforming " + className);
49-
return classfileBuffer;
49+
return null;
5050
}
5151
}
5252

‎modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/EnterpriseGeoIpDownloaderIT.java‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.elasticsearch.ExceptionsHelper;
1515
import org.elasticsearch.ResourceAlreadyExistsException;
1616
import org.elasticsearch.action.ActionListener;
17+
import org.elasticsearch.action.LatchedActionListener;
1718
import org.elasticsearch.action.bulk.BulkItemResponse;
1819
import org.elasticsearch.action.bulk.BulkRequest;
1920
import org.elasticsearch.action.bulk.BulkResponse;
@@ -22,13 +23,16 @@
2223
import org.elasticsearch.action.index.IndexRequest;
2324
import org.elasticsearch.action.search.SearchRequest;
2425
import org.elasticsearch.action.search.SearchResponse;
26+
import org.elasticsearch.action.support.SubscribableListener;
27+
import org.elasticsearch.action.support.master.AcknowledgedResponse;
2528
import org.elasticsearch.common.Strings;
2629
import org.elasticsearch.common.settings.MockSecureSettings;
2730
import org.elasticsearch.common.settings.Settings;
2831
import org.elasticsearch.common.util.CollectionUtils;
2932
import org.elasticsearch.core.TimeValue;
3033
import org.elasticsearch.ingest.EnterpriseGeoIpTask;
3134
import org.elasticsearch.ingest.geoip.direct.DatabaseConfiguration;
35+
import org.elasticsearch.ingest.geoip.direct.DeleteDatabaseConfigurationAction;
3236
import org.elasticsearch.ingest.geoip.direct.PutDatabaseConfigurationAction;
3337
import org.elasticsearch.persistent.PersistentTasksService;
3438
import org.elasticsearch.plugins.Plugin;
@@ -38,12 +42,15 @@
3842
import org.elasticsearch.test.junit.annotations.TestLogging;
3943
import org.elasticsearch.transport.RemoteTransportException;
4044
import org.elasticsearch.xcontent.XContentType;
45+
import org.junit.After;
4146
import org.junit.ClassRule;
4247

4348
import java.io.IOException;
4449
import java.util.Collection;
4550
import java.util.List;
4651
import java.util.Map;
52+
import java.util.concurrent.CountDownLatch;
53+
import java.util.concurrent.TimeUnit;
4754

4855
import static org.elasticsearch.ingest.EnterpriseGeoIpTask.ENTERPRISE_GEOIP_DOWNLOADER;
4956
import static org.elasticsearch.ingest.geoip.EnterpriseGeoIpDownloaderTaskExecutor.IPINFO_TOKEN_SETTING;
@@ -54,6 +61,8 @@ public class EnterpriseGeoIpDownloaderIT extends ESIntegTestCase {
5461

5562
private static final String MAXMIND_DATABASE_TYPE = "GeoIP2-City";
5663
private static final String IPINFO_DATABASE_TYPE = "asn";
64+
private static final String MAXMIND_CONFIGURATION = "test-1";
65+
private static final String IPINFO_CONFIGURATION = "test-2";
5766

5867
@ClassRule
5968
public static final EnterpriseGeoIpHttpFixture fixture = new EnterpriseGeoIpHttpFixture(
@@ -140,6 +149,28 @@ public void testEnterpriseDownloaderTask() throws Exception {
140149
});
141150
}
142151

152+
@After
153+
public void cleanup() throws InterruptedException {
154+
/*
155+
* This method cleans up the database configurations that the test created. This allows the test to be run repeatedly.
156+
*/
157+
CountDownLatch latch = new CountDownLatch(1);
158+
LatchedActionListener<AcknowledgedResponse> listener = new LatchedActionListener<>(ActionListener.noop(), latch);
159+
SubscribableListener.<AcknowledgedResponse>newForked(l -> deleteDatabaseConfiguration(MAXMIND_CONFIGURATION, l))
160+
.<AcknowledgedResponse>andThen(l -> deleteDatabaseConfiguration(IPINFO_CONFIGURATION, l))
161+
.addListener(listener);
162+
latch.await(10, TimeUnit.SECONDS);
163+
}
164+
165+
private void deleteDatabaseConfiguration(String configurationName, ActionListener<AcknowledgedResponse> listener) {
166+
admin().cluster()
167+
.execute(
168+
DeleteDatabaseConfigurationAction.INSTANCE,
169+
new DeleteDatabaseConfigurationAction.Request(TimeValue.MAX_VALUE, TimeValue.timeValueSeconds(10), configurationName),
170+
listener
171+
);
172+
}
173+
143174
private void startEnterpriseGeoIpDownloaderTask() {
144175
PersistentTasksService persistentTasksService = internalCluster().getInstance(PersistentTasksService.class);
145176
persistentTasksService.sendStartRequest(
@@ -163,7 +194,7 @@ private void configureMaxmindDatabase(String databaseType) {
163194
new PutDatabaseConfigurationAction.Request(
164195
TimeValue.MAX_VALUE,
165196
TimeValue.MAX_VALUE,
166-
new DatabaseConfiguration("test-1", databaseType, new DatabaseConfiguration.Maxmind("test_account"))
197+
new DatabaseConfiguration(MAXMIND_CONFIGURATION, databaseType, new DatabaseConfiguration.Maxmind("test_account"))
167198
)
168199
)
169200
.actionGet();
@@ -176,7 +207,7 @@ private void configureIpinfoDatabase(String databaseType) {
176207
new PutDatabaseConfigurationAction.Request(
177208
TimeValue.MAX_VALUE,
178209
TimeValue.MAX_VALUE,
179-
new DatabaseConfiguration("test-2", databaseType, new DatabaseConfiguration.Ipinfo())
210+
new DatabaseConfiguration(IPINFO_CONFIGURATION, databaseType, new DatabaseConfiguration.Ipinfo())
180211
)
181212
)
182213
.actionGet();

‎muted-tests.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,18 @@ tests:
392392
- class: org.elasticsearch.xpack.esql.action.ManyShardsIT
393393
method: testCancelUnnecessaryRequests
394394
issue: https://github.com/elastic/elasticsearch/issues/125947
395+
- class: org.elasticsearch.xpack.ilm.actions.SearchableSnapshotActionIT
396+
method: testResumingSearchableSnapshotFromPartialToFull
397+
issue: https://github.com/elastic/elasticsearch/issues/125789
398+
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
399+
method: test {p0=transform/transforms_stats/Test get transform stats with timeout}
400+
issue: https://github.com/elastic/elasticsearch/issues/125975
401+
- class: org.elasticsearch.search.SearchServiceSingleNodeTests
402+
method: testSlicingBehaviourForParallelCollection
403+
issue: https://github.com/elastic/elasticsearch/issues/125899
404+
- class: org.elasticsearch.packaging.test.DockerTests
405+
method: test021InstallPlugin
406+
issue: https://github.com/elastic/elasticsearch/issues/116147
395407

396408
# Examples:
397409
#

‎server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected void shardOperation(
100100
SubscribableListener.<IndexShard>newForked(l -> {
101101
IndexShard indexShard = indicesService.indexServiceSafe(shardRouting.shardId().getIndex())
102102
.getShard(shardRouting.shardId().id());
103-
indexShard.ensureMutable(l.map(unused -> indexShard));
103+
indexShard.ensureMutable(l.map(unused -> indexShard), false);
104104
}).<EmptyResult>andThen((l, indexShard) -> {
105105
threadPool.executor(ThreadPool.Names.FORCE_MERGE).execute(ActionRunnable.supply(l, () -> {
106106
indexShard.forceMerge(request);

0 commit comments

Comments
 (0)