Configure TMP for test nodes on Windows (#39959)

alpar-t · web-flow · commit 97562a874fcb · 2019-03-13T19:11:50.000+02:00
This breaks on windows where TMP dir default to C:\Windows and startup
fails with a permission error.
I tried to create a tmp dir and pass in `TMP` env, but it lead to a
class not found error, and since testclusers is already independent of
the calling environment I stopped there.
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
@@ -690,6 +690,13 @@ class ClusterFormationTasks {
                     env(key: 'JAVA_HOME', value: project.runtimeJavaHome)
                 }
                 node.args.each { arg(value: it) }
+                if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                    // Having no TMP on Windows defaults to C:\Windows and permission errors
+                    // Since we configure ant to run with a new  environment above, we need to set this to a dir we have access to
+                    File tmpDir = new File(node.baseDir, "tmp")
+                    tmpDir.mkdirs()
+                    env(key: "TMP", value: tmpDir.absolutePath)
+                }
             }
         }
 
diff --git a/distribution/src/bin/elasticsearch b/distribution/src/bin/elasticsearch
@@ -18,7 +18,7 @@ source "`dirname "$0"`"/elasticsearch-env
 
 ES_JVM_OPTIONS="$ES_PATH_CONF"/jvm.options
 JVM_OPTIONS=`"$JAVA" -cp "$ES_CLASSPATH" org.elasticsearch.tools.launchers.JvmOptionsParser "$ES_JVM_OPTIONS"`
-ES_JAVA_OPTS="${JVM_OPTIONS//\$\{ES_TMPDIR\}/$ES_TMPDIR} $ES_JAVA_OPTS"
+ES_JAVA_OPTS="${JVM_OPTIONS//\"\$\{ES_TMPDIR\}\"/$ES_TMPDIR} $ES_JAVA_OPTS"
 
 cd "$ES_HOME"
 # manual parsing to find out, if process should be detached
diff --git a/distribution/src/config/jvm.options b/distribution/src/config/jvm.options
@@ -86,7 +86,7 @@
 -Dlog4j.shutdownHookEnabled=false
 -Dlog4j2.disable.jmx=true
 
--Djava.io.tmpdir=${ES_TMPDIR}
+-Djava.io.tmpdir="${ES_TMPDIR}"
 
 ## heap dumps
 

Original file line number	Diff line number	Diff line change
`@@ -690,6 +690,13 @@ class ClusterFormationTasks {`
`690`	`690`	`env(key: 'JAVA_HOME', value: project.runtimeJavaHome)`
`691`	`691`	`}`
`692`	`692`	`node.args.each { arg(value: it) }`
	`693`	`+ if (Os.isFamily(Os.FAMILY_WINDOWS)) {`
	`694`	`+ // Having no TMP on Windows defaults to C:\Windows and permission errors`
	`695`	`+ // Since we configure ant to run with a new environment above, we need to set this to a dir we have access to`
	`696`	`+ File tmpDir = new File(node.baseDir, "tmp")`
	`697`	`+ tmpDir.mkdirs()`
	`698`	`+ env(key: "TMP", value: tmpDir.absolutePath)`
	`699`	`+ }`
`693`	`700`	`}`
`694`	`701`	`}`
`695`	`702`