diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-03-12 15:36:59 +0100 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2020-03-12 15:36:59 +0100 |
| commit | e69bc5380db9f6c896f0ceb31f848a8b2f8fbf43 (patch) | |
| tree | 03921c3a026818f354047ca9f0309953660d6a22 | |
| parent | 2f9ac1e3a86e0d1c43b83617ca512cf8929133dd (diff) | |
Set Java system property java.io.tmpdir to $VESPA_HOME/tmp
| -rwxr-xr-x | config-proxy/src/main/sh/vespa-config-ctl.sh | 4 | ||||
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 1 | ||||
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 1 | ||||
| -rwxr-xr-x | logserver/bin/logserver-start.sh | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh index 3998d4f69d6..ed59925298c 100755 --- a/config-proxy/src/main/sh/vespa-config-ctl.sh +++ b/config-proxy/src/main/sh/vespa-config-ctl.sh @@ -121,7 +121,9 @@ case $1 in vespa-runserver -r 10 -s configproxy -p $P_CONFIG_PROXY -- \ java ${jvmopts} \ -XX:+ExitOnOutOfMemoryError $(getJavaOptionsIPV46) \ - -Dproxyconfigsources="${configsources}" ${userargs} \ + -Dproxyconfigsources="${configsources}" \ + -Djava.io.tmpdir=${VESPA_HOME}/tmp \ + ${userargs} \ -XX:ActiveProcessorCount=2 \ -cp $cp com.yahoo.vespa.config.proxy.ProxyServer 19090 diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index bec206214f8..bded46dbebe 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -174,6 +174,7 @@ vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \ --add-opens=java.base/java.lang=ALL-UNNAMED \ --add-opens=java.base/java.net=ALL-UNNAMED \ --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED \ + -Djava.io.tmpdir=${VESPA_HOME}/tmp \ -Djava.library.path=${VESPA_HOME}/lib64 \ -Djava.awt.headless=true \ -Dsun.rmi.dgc.client.gcInterval=3600000 \ diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh index af429d56a75..1ed2d5ccf29 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -216,6 +216,7 @@ exec $numactlcmd $envcmd java \ --add-opens=java.base/java.lang=ALL-UNNAMED \ --add-opens=java.base/java.net=ALL-UNNAMED \ --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED \ + -Djava.io.tmpdir="${VESPA_HOME}/tmp" \ -Djava.library.path="${VESPA_HOME}/lib64" \ -Djava.awt.headless=true \ -Djavax.net.ssl.keyStoreType=JKS \ diff --git a/logserver/bin/logserver-start.sh b/logserver/bin/logserver-start.sh index 913cdb78327..fe4b5ebbb64 100755 --- a/logserver/bin/logserver-start.sh +++ b/logserver/bin/logserver-start.sh @@ -78,7 +78,7 @@ ROOT=${VESPA_HOME%/} export ROOT cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } -addopts="-server -Xms32m -Xmx256m -XX:CompressedClassSpaceSize=32m -XX:MaxDirectMemorySize=32m -XX:ThreadStackSize=256 -XX:MaxJavaStackTraceDepth=1000 -XX:ActiveProcessorCount=2" +addopts="-server -Xms32m -Xmx256m -XX:CompressedClassSpaceSize=32m -XX:MaxDirectMemorySize=32m -XX:ThreadStackSize=256 -XX:MaxJavaStackTraceDepth=1000 -XX:ActiveProcessorCount=2 -Djava.io.tmpdir=${VESPA_HOME}/tmp" oomopt="-XX:+ExitOnOutOfMemoryError" |