Skip to content

Commit c1c1e4e

Browse files
original-brownbearoriginal-brownbear
authored
Merge branch 'main' into remove-some-copies
2 parents 05c5b1e + ec4022a commit c1c1e4e

File tree

19 files changed

+185
-497
lines changed

19 files changed

+185
-497
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,15 @@ interface JdkBuild {
3333
String url(String os, String arch, String extension);
3434
}
3535

36-
record ReleasedJdkBuild(JavaLanguageVersion languageVersion, String version, String buildNumber, String hash) implements JdkBuild {
36+
record ReleaseJdkBuild(JavaLanguageVersion languageVersion, String host, String version, String buildNumber, String hash)
37+
implements
38+
JdkBuild {
3739

3840
@Override
3941
public String url(String os, String arch, String extension) {
40-
return "https://download.oracle.com/java/GA/jdk"
42+
return "https://"
43+
+ host
44+
+ "/java/GA/jdk"
4145
+ version
4246
+ "/"
4347
+ hash
@@ -111,7 +115,8 @@ private static String resolveBuildNumber(int version) {
111115
// package private so it can be replaced by tests
112116
List<JdkBuild> builds = List.of(
113117
getBundledJdkBuild(),
114-
new EarlyAccessJdkBuild(JavaLanguageVersion.of(24)),
118+
// release candidate of JDK 24
119+
new ReleaseJdkBuild(JavaLanguageVersion.of(24), "download.java.net", "24", "36", "1f9ff9062db4449d8ca828c504ffae90"),
115120
new EarlyAccessJdkBuild(JavaLanguageVersion.of(25))
116121
);
117122

@@ -125,7 +130,7 @@ private JdkBuild getBundledJdkBuild() {
125130
String baseVersion = jdkVersionMatcher.group(1) + (jdkVersionMatcher.group(2) != null ? (jdkVersionMatcher.group(2)) : "");
126131
String build = jdkVersionMatcher.group(3);
127132
String hash = jdkVersionMatcher.group(5);
128-
return new ReleasedJdkBuild(bundledJdkMajorVersion, baseVersion, build, hash);
133+
return new ReleaseJdkBuild(bundledJdkMajorVersion, "download.oracle.com", baseVersion, build, hash);
129134
}
130135

131136
/**

‎build-tools-internal/src/test/groovy/org/elasticsearch/gradle/internal/toolchain/OracleOpenJdkToolchainResolverSpec.groovy‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ class OracleOpenJdkToolchainResolverSpec extends AbstractToolchainResolverSpec {
3030
return null
3131
}
3232
}
33-
toolChain.builds = toolChain.builds.findAll { it instanceof OracleOpenJdkToolchainResolver.EarlyAccessJdkBuild } + [
34-
new OracleOpenJdkToolchainResolver.ReleasedJdkBuild(
33+
toolChain.builds = toolChain.builds + [
34+
new OracleOpenJdkToolchainResolver.ReleaseJdkBuild(
3535
JavaLanguageVersion.of(20),
36+
"download.oracle.com",
3637
"20",
3738
"36",
3839
"bdc68b4b9cbc4ebcb30745c85038d91d"
@@ -52,16 +53,16 @@ class OracleOpenJdkToolchainResolverSpec extends AbstractToolchainResolverSpec {
5253
[20, anyVendor(), LINUX, AARCH64, "https://download.oracle.com/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-aarch64_bin.tar.gz"],
5354
[20, anyVendor(), WINDOWS, X86_64, "https://download.oracle.com/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_windows-x64_bin.zip"],
5455
// https://download.java.net/java/early_access/jdk23/23/GPL/openjdk-23-ea+23_macos-aarch64_bin.tar.gz
55-
[24, ORACLE, MAC_OS, X86_64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_macos-x64_bin.tar.gz"],
56-
[24, ORACLE, MAC_OS, AARCH64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_macos-aarch64_bin.tar.gz"],
57-
[24, ORACLE, LINUX, X86_64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_linux-x64_bin.tar.gz"],
58-
[24, ORACLE, LINUX, AARCH64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_linux-aarch64_bin.tar.gz"],
59-
[24, ORACLE, WINDOWS, X86_64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_windows-x64_bin.zip"],
60-
[24, anyVendor(), MAC_OS, X86_64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_macos-x64_bin.tar.gz"],
61-
[24, anyVendor(), MAC_OS, AARCH64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_macos-aarch64_bin.tar.gz"],
62-
[24, anyVendor(), LINUX, X86_64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_linux-x64_bin.tar.gz"],
63-
[24, anyVendor(), LINUX, AARCH64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_linux-aarch64_bin.tar.gz"],
64-
[24, anyVendor(), WINDOWS, X86_64, "https://download.java.net/java/early_access/jdk24/29/GPL/openjdk-24-ea+29_windows-x64_bin.zip"]]
56+
[24, ORACLE, MAC_OS, X86_64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-x64_bin.tar.gz"],
57+
[24, ORACLE, MAC_OS, AARCH64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-aarch64_bin.tar.gz"],
58+
[24, ORACLE, LINUX, X86_64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-x64_bin.tar.gz"],
59+
[24, ORACLE, LINUX, AARCH64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-aarch64_bin.tar.gz"],
60+
[24, ORACLE, WINDOWS, X86_64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_windows-x64_bin.zip"],
61+
[24, anyVendor(), MAC_OS, X86_64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-x64_bin.tar.gz"],
62+
[24, anyVendor(), MAC_OS, AARCH64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_macos-aarch64_bin.tar.gz"],
63+
[24, anyVendor(), LINUX, X86_64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-x64_bin.tar.gz"],
64+
[24, anyVendor(), LINUX, AARCH64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_linux-aarch64_bin.tar.gz"],
65+
[24, anyVendor(), WINDOWS, X86_64, "https://download.java.net/java/GA/jdk24/1f9ff9062db4449d8ca828c504ffae90/36/GPL/openjdk-24_windows-x64_bin.zip"]]
6566
}
6667

6768
@RestoreSystemProperties
@@ -85,16 +86,6 @@ class OracleOpenJdkToolchainResolverSpec extends AbstractToolchainResolverSpec {
8586

8687
where:
8788
version | vendor | os | arch | expectedUrl
88-
24 | ORACLE | MAC_OS | X86_64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_macos-x64_bin.tar.gz"
89-
24 | ORACLE | MAC_OS | AARCH64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_macos-aarch64_bin.tar.gz"
90-
24 | ORACLE | LINUX | X86_64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_linux-x64_bin.tar.gz"
91-
24 | ORACLE | LINUX | AARCH64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_linux-aarch64_bin.tar.gz"
92-
24 | ORACLE | WINDOWS | X86_64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_windows-x64_bin.zip"
93-
24 | anyVendor() | MAC_OS | X86_64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_macos-x64_bin.tar.gz"
94-
24 | anyVendor() | MAC_OS | AARCH64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_macos-aarch64_bin.tar.gz"
95-
24 | anyVendor() | LINUX | X86_64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_linux-x64_bin.tar.gz"
96-
24 | anyVendor() | LINUX | AARCH64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_linux-aarch64_bin.tar.gz"
97-
24 | anyVendor() | WINDOWS | X86_64 | urlPrefix(24) + "42/GPL/openjdk-24-ea+42_windows-x64_bin.zip"
9889
25 | ORACLE | MAC_OS | X86_64 | urlPrefix(25) + "13/GPL/openjdk-25-ea+13_macos-x64_bin.tar.gz"
9990
25 | ORACLE | MAC_OS | AARCH64 | urlPrefix(25) + "13/GPL/openjdk-25-ea+13_macos-aarch64_bin.tar.gz"
10091
25 | ORACLE | LINUX | X86_64 | urlPrefix(25) + "13/GPL/openjdk-25-ea+13_linux-x64_bin.tar.gz"

‎libs/entitlement/src/main/java/org/elasticsearch/entitlement/bootstrap/EntitlementBootstrap.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public record BootstrapArgs(
4141
Path[] sharedRepoDirs,
4242
Path configDir,
4343
Path libDir,
44+
Path pluginsDir,
4445
Path logsDir,
4546
Path tempDir,
4647
Path pidFile,
@@ -58,6 +59,7 @@ public record BootstrapArgs(
5859
requireNonNull(sharedRepoDirs);
5960
requireNonNull(configDir);
6061
requireNonNull(libDir);
62+
requireNonNull(pluginsDir);
6163
requireNonNull(logsDir);
6264
requireNonNull(tempDir);
6365
requireNonNull(suppressFailureLogClasses);
@@ -82,6 +84,7 @@ public static BootstrapArgs bootstrapArgs() {
8284
* @param sharedRepoDirs shared repository directories for Elasticsearch
8385
* @param configDir the config directory for Elasticsearch
8486
* @param libDir the lib directory for Elasticsearch
87+
* @param pluginsDir the directory where plugins are installed for Elasticsearch
8588
* @param tempDir the temp directory for Elasticsearch
8689
* @param logsDir the log directory for Elasticsearch
8790
* @param pidFile path to a pid file for Elasticsearch, or {@code null} if one was not specified
@@ -96,6 +99,7 @@ public static void bootstrap(
9699
Path[] sharedRepoDirs,
97100
Path configDir,
98101
Path libDir,
102+
Path pluginsDir,
99103
Path logsDir,
100104
Path tempDir,
101105
Path pidFile,
@@ -114,6 +118,7 @@ public static void bootstrap(
114118
sharedRepoDirs,
115119
configDir,
116120
libDir,
121+
pluginsDir,
117122
logsDir,
118123
tempDir,
119124
pidFile,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ private static PolicyManager createPolicyManager() {
152152
Collections.addAll(
153153
serverModuleFileDatas,
154154
// Base ES directories
155+
FileData.ofPath(bootstrapArgs.pluginsDir(), READ),
155156
FileData.ofPath(bootstrapArgs.configDir(), READ),
156157
FileData.ofPath(bootstrapArgs.logsDir(), READ_WRITE),
157158
FileData.ofRelativePath(Path.of(""), DATA, READ_WRITE),

‎muted-tests.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,6 @@ tests:
313313
- class: org.elasticsearch.repositories.gcs.GoogleCloudStorageServiceTests
314314
method: testClientsAreNotSharedAcrossRepositories
315315
issue: https://github.com/elastic/elasticsearch/issues/123090
316-
- class: org.elasticsearch.xpack.esql.action.EnrichIT
317-
method: testAvgDurationByArtist
318-
issue: https://github.com/elastic/elasticsearch/issues/123093
319316
- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
320317
method: test {yaml=reference/troubleshooting/common-issues/disk-usage-exceeded/line_65}
321318
issue: https://github.com/elastic/elasticsearch/issues/123094
@@ -349,6 +346,12 @@ tests:
349346
- class: org.elasticsearch.index.mapper.IPSyntheticSourceNativeArrayIntegrationTests
350347
method: testSynthesizeArrayIgnoreMalformed
351348
issue: https://github.com/elastic/elasticsearch/issues/123419
349+
- class: org.elasticsearch.packaging.test.DockerTests
350+
method: test151MachineDependentHeapWithSizeOverride
351+
issue: https://github.com/elastic/elasticsearch/issues/123437
352+
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT
353+
method: testOneRemoteClusterPartial
354+
issue: https://github.com/elastic/elasticsearch/issues/123451
352355

353356
# Examples:
354357
#

‎server/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ private static void initPhase2(Bootstrap bootstrap) throws IOException {
254254
nodeEnv.repoDirs(),
255255
nodeEnv.configDir(),
256256
nodeEnv.libDir(),
257+
nodeEnv.pluginsDir(),
257258
nodeEnv.logsDir(),
258259
nodeEnv.tmpDir(),
259260
args.pidFile(),

‎x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/Driver.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public class Driver implements Releasable, Describable {
7777
private final DriverContext driverContext;
7878
private final Supplier<String> description;
7979
private final List<Operator> activeOperators;
80-
private final List<DriverStatus.OperatorStatus> statusOfCompletedOperators = new ArrayList<>();
80+
private final List<OperatorStatus> statusOfCompletedOperators = new ArrayList<>();
8181
private final Releasable releasable;
8282
private final long statusNanos;
8383

@@ -329,7 +329,7 @@ private void closeEarlyFinishedOperators() {
329329
Iterator<Operator> itr = finishedOperators.iterator();
330330
while (itr.hasNext()) {
331331
Operator op = itr.next();
332-
statusOfCompletedOperators.add(new DriverStatus.OperatorStatus(op.toString(), op.status()));
332+
statusOfCompletedOperators.add(new OperatorStatus(op.toString(), op.status()));
333333
op.close();
334334
itr.remove();
335335
}
@@ -555,7 +555,7 @@ private void updateStatus(long extraCpuNanos, int extraIterations, DriverStatus.
555555
prev.iterations() + extraIterations,
556556
status,
557557
statusOfCompletedOperators,
558-
activeOperators.stream().map(op -> new DriverStatus.OperatorStatus(op.toString(), op.status())).toList(),
558+
activeOperators.stream().map(op -> new OperatorStatus(op.toString(), op.status())).toList(),
559559
sleeps
560560
);
561561
});

0 commit comments

Comments
 (0)