Skip to content

Commit e41fc78

Browse files
elasticmachineelasticmachine
authored
Merge branch 'main' into index-version-compatibility-IT
2 parents b218cde + a97e006 commit e41fc78

File tree

399 files changed

+5573
-2945
lines changed

Some content is hidden

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

399 files changed

+5573
-2945
lines changed

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ expensive messages that will usually be discarded:
467467

468468
Logging is an important behaviour of the system and sometimes deserves its own
469469
unit tests, especially if there is complex logic for computing what is logged
470-
and when to log it. You can use a `org.elasticsearch.test.MockLogAppender` to
470+
and when to log it. You can use a `org.elasticsearch.test.MockLog` to
471471
make assertions about the logs that are being emitted.
472472

473473
Logging is a powerful diagnostic technique, but it is not the only possibility.

‎benchmarks/src/main/java/org/elasticsearch/benchmark/routing/allocation/ShardsAvailabilityHealthIndicatorBenchmark.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.elasticsearch.cluster.metadata.IndexMetadata;
1515
import org.elasticsearch.cluster.metadata.Metadata;
1616
import org.elasticsearch.cluster.node.DiscoveryNodes;
17+
import org.elasticsearch.cluster.project.DefaultProjectResolver;
1718
import org.elasticsearch.cluster.routing.IndexRoutingTable;
1819
import org.elasticsearch.cluster.routing.IndexShardRoutingTable;
1920
import org.elasticsearch.cluster.routing.RecoverySource;
@@ -178,7 +179,12 @@ public void setUp() throws Exception {
178179
new TaskManager(Settings.EMPTY, threadPool, Collections.emptySet())
179180
);
180181
clusterService.getClusterApplierService().setInitialState(initialClusterState);
181-
indicatorService = new ShardsAvailabilityHealthIndicatorService(clusterService, allocationService, new SystemIndices(List.of()));
182+
indicatorService = new ShardsAvailabilityHealthIndicatorService(
183+
clusterService,
184+
allocationService,
185+
new SystemIndices(List.of()),
186+
DefaultProjectResolver.INSTANCE
187+
);
182188
}
183189

184190
private int toInt(String v) {

‎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/DockerBase.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ public enum DockerBase {
2626
"-wolfi",
2727
"apk"
2828
),
29-
30-
FIPS("docker.elastic.co/wolfi/chainguard-base-fips:sha256-feb7aeb1bbcb331afa089388f2fa1e81997fc24642ca4fa06b7e502ff599a4cf", "-fips", "apk"),
29+
FIPS("docker.elastic.co/wolfi/chainguard-base-fips:sha256-ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7", "-fips", "apk"),
3130
// spotless:on
3231
// Based on WOLFI above, with more extras. We don't set a base image because
3332
// we programmatically extend from the wolfi image.

‎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));

‎distribution/docker/fips-docker-aarch64-export/build.gradle‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
8+
*/
9+

‎docs/changelog/106953.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 106953
2+
summary: Optimize usage calculation in ILM policies retrieval API
3+
area: ILM+SLM
4+
type: enhancement
5+
issues:
6+
- 105773

‎docs/changelog/125477.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 125477
2+
summary: Prevent get datafeeds stats API returning an error when local tasks are slow to stop
3+
area: Machine Learning
4+
type: bug
5+
issues:
6+
- 104160

0 commit comments

Comments
 (0)