Skip to content

Commit 063fd6d

Browse files
authored
Use absolute paths for JVM arguments in test clusters (#94567)
1 parent e8c8aed commit 063fd6d

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,13 +1493,12 @@ private Map<String, String> jvmOptionExpansions() {
14931493
Map<String, String> expansions = new HashMap<>();
14941494
Version version = getVersion();
14951495
String heapDumpOrigin = getVersion().onOrAfter("6.3.0") ? "-XX:HeapDumpPath=data" : "-XX:HeapDumpPath=/heap/dump/path";
1496-
Path relativeLogPath = workingDir.relativize(confPathLogs);
1497-
expansions.put(heapDumpOrigin, "-XX:HeapDumpPath=" + relativeLogPath);
1496+
expansions.put(heapDumpOrigin, "-XX:HeapDumpPath=" + confPathLogs);
14981497
if (version.onOrAfter("6.2.0")) {
1499-
expansions.put("logs/gc.log", relativeLogPath.resolve("gc.log").toString());
1498+
expansions.put("logs/gc.log", confPathLogs.resolve("gc.log").toString());
15001499
}
15011500
if (getVersion().getMajor() >= 7) {
1502-
expansions.put("-XX:ErrorFile=logs/hs_err_pid%p.log", "-XX:ErrorFile=" + relativeLogPath.resolve("hs_err_pid%p.log"));
1501+
expansions.put("-XX:ErrorFile=logs/hs_err_pid%p.log", "-XX:ErrorFile=" + confPathLogs.resolve("hs_err_pid%p.log"));
15031502
}
15041503
return expansions;
15051504
}

0 commit comments

Comments
 (0)