From a07c0113943f051e9b758a0e84ac168383178e0b Mon Sep 17 00:00:00 2001 From: Mark Vieira Date: Tue, 4 Mar 2025 11:32:42 -0800 Subject: [PATCH] Add jdk.management.agent module to server boot layer on start (#123938) --- .../java/org/elasticsearch/server/cli/ServerProcessBuilder.java | 1 + .../java/org/elasticsearch/packaging/util/docker/Docker.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/ServerProcessBuilder.java b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/ServerProcessBuilder.java index 293c4af3270b9..adebf6be9842b 100644 --- a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/ServerProcessBuilder.java +++ b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/ServerProcessBuilder.java @@ -109,6 +109,7 @@ private List getJvmArgs() { esHome.resolve("lib").toString(), // Special circumstances require some modules (not depended on by the main server module) to be explicitly added: "--add-modules=jdk.net", // needed to reflectively set extended socket options + "--add-modules=jdk.management.agent", // needed by external debug tools to grab thread and heap dumps // we control the module path, which may have additional modules not required by server "--add-modules=ALL-MODULE-PATH", "-m", diff --git a/qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java b/qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java index 808aec92fb35d..7bb45e6029409 100644 --- a/qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java +++ b/qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java @@ -187,7 +187,7 @@ public static void waitForElasticsearchToStart() { Thread.sleep(STARTUP_SLEEP_INTERVAL_MILLISECONDS); // Set COLUMNS so that `ps` doesn't truncate its output - psOutput = dockerShell.run("bash -c 'COLUMNS=2000 ps ax'").stdout(); + psOutput = dockerShell.run("bash -c 'COLUMNS=3000 ps ax'").stdout(); if (psOutput.contains("org.elasticsearch.bootstrap.Elasticsearch")) { isElasticsearchRunning = true;