address feedback

Author: rjernst

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

@@ -1460,7 +1460,7 @@ private Map<ReplacementKey, String> jvmOptionExpansions() {
         Version version = getVersion();
 
         ReplacementKey heapDumpPathSub;
-        if (version.before("8.18.0") && version.onOrAfter("6.3.0")) {
+        if (version.before("8.19.0") && version.onOrAfter("6.3.0")) {
             heapDumpPathSub = new ReplacementKey("-XX:HeapDumpPath=data", "");
         } else {
             // temporarily fall back to the old substitution so both old and new work during backport
@@ -1469,7 +1469,7 @@ private Map<ReplacementKey, String> jvmOptionExpansions() {
         expansions.put(heapDumpPathSub, "-XX:HeapDumpPath=" + confPathLogs);
 
         ReplacementKey gcLogSub;
-        if (version.before("8.18.0") && version.onOrAfter("6.2.0")) {
+        if (version.before("8.19.0") && version.onOrAfter("6.2.0")) {
             gcLogSub = new ReplacementKey("logs/gc.log", "");
         } else {
             // temporarily check the old substitution first so both old and new work during backport
@@ -1478,7 +1478,7 @@ private Map<ReplacementKey, String> jvmOptionExpansions() {
         expansions.put(gcLogSub, confPathLogs.resolve("gc.log").toString());
 
         ReplacementKey errorFileSub;
-        if (version.before("8.18.0") && version.getMajor() >= 7) {
+        if (version.before("8.19.0") && version.getMajor() >= 7) {
             errorFileSub = new ReplacementKey("-XX:ErrorFile=logs/hs_err_pid%p.log", "");
         } else {
             // temporarily check the old substitution first so both old and new work during backport

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

@@ -130,7 +130,8 @@ private static List<String> flagsFinal(final List<String> userDefinedJvmOptions)
 
     @SuppressForbidden(reason = "ProcessBuilder takes File")
     private static void setWorkingDir(ProcessBuilder builder) throws IOException {
-        // set temp dir as working dir so it is writeable
+        // The real ES process uses the logs dir as the working directory. Since we don't
+        // have the logs dir yet, here we use a temp directory for calculating jvm options.
         final Path tmpDir = Files.createTempDirectory("final-flags");
         builder.directory(tmpDir.toFile());
     }

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterFactory.java

@@ -924,7 +924,7 @@ private Map<ReplacementKey, String> getJvmOptionsReplacements() {
             var version = spec.getVersion();
 
             ReplacementKey heapDumpPathSub;
-            if (version.before("8.18.0") && version.onOrAfter("6.3.0")) {
+            if (version.before("8.19.0") && version.onOrAfter("6.3.0")) {
                 heapDumpPathSub = new ReplacementKey("-XX:HeapDumpPath=data", "");
             } else {
                 // temporarily fall back to the old substitution so both old and new work during backport
@@ -933,7 +933,7 @@ private Map<ReplacementKey, String> getJvmOptionsReplacements() {
             expansions.put(heapDumpPathSub, "-XX:HeapDumpPath=" + logsDir);
 
             ReplacementKey gcLogSub;
-            if (version.before("8.18.0") && version.onOrAfter("6.2.0")) {
+            if (version.before("8.19.0") && version.onOrAfter("6.2.0")) {
                 gcLogSub = new ReplacementKey("logs/gc.log", "");
             } else {
                 // temporarily check the old substitution first so both old and new work during backport
@@ -942,7 +942,7 @@ private Map<ReplacementKey, String> getJvmOptionsReplacements() {
             expansions.put(gcLogSub, logsDir.resolve("gc.log").toString());
 
             ReplacementKey errorFileSub;
-            if (version.before("8.18.0") && version.getMajor() >= 7) {
+            if (version.before("8.19.0") && version.getMajor() >= 7) {
                 errorFileSub = new ReplacementKey("-XX:ErrorFile=logs/hs_err_pid%p.log", "");
             } else {
                 // temporarily check the old substitution first so both old and new work during backport