Skip to content

Commit 058ec32

Browse files
authored
Add jdk.management.agent module to server boot layer on start (#123938) (#124042)
1 parent 5479492 commit 058ec32

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/ServerProcessBuilder.java

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ private List<String> getJvmArgs() {
109109
esHome.resolve("lib").toString(),
110110
// Special circumstances require some modules (not depended on by the main server module) to be explicitly added:
111111
"--add-modules=jdk.net", // needed to reflectively set extended socket options
112+
"--add-modules=jdk.management.agent", // needed by external debug tools to grab thread and heap dumps
112113
// we control the module path, which may have additional modules not required by server
113114
"--add-modules=ALL-MODULE-PATH",
114115
"-m",

qa/packaging/src/test/java/org/elasticsearch/packaging/util/docker/Docker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public static void waitForElasticsearchToStart() {
187187
Thread.sleep(STARTUP_SLEEP_INTERVAL_MILLISECONDS);
188188

189189
// Set COLUMNS so that `ps` doesn't truncate its output
190-
psOutput = dockerShell.run("bash -c 'COLUMNS=2000 ps ax'").stdout();
190+
psOutput = dockerShell.run("bash -c 'COLUMNS=3000 ps ax'").stdout();
191191

192192
if (psOutput.contains("org.elasticsearch.bootstrap.Elasticsearch")) {
193193
isElasticsearchRunning = true;

0 commit comments

Comments
 (0)