diff options
| author | Harald Musum <musum@verizonmedia.com> | 2020-02-14 06:36:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 06:36:17 +0100 |
| commit | 27ac133d4a7bce7e40dd826947ee073f751fed8d (patch) | |
| tree | a225b70996ba95f2100c7e5ca169a9824486d9a0 | |
| parent | 1baff5ca488f92893432ebc4d414cc93d8a9579d (diff) | |
Revert "Only use 2 cores for config proxy"
| -rwxr-xr-x | config-proxy/src/main/sh/vespa-config-ctl.sh | 3 | ||||
| -rwxr-xr-x | logserver/bin/logserver-start.sh | 2 |
2 files changed, 2 insertions, 3 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..a17f0abed92 100755 --- a/config-proxy/src/main/sh/vespa-config-ctl.sh +++ b/config-proxy/src/main/sh/vespa-config-ctl.sh @@ -113,7 +113,7 @@ case $1 in if [ "$userargs" == "" ]; then userargs=$services__jvmargs_configproxy fi - jvmopts="-Xms32M -Xmx256M -XX:CompressedClassSpaceSize=32m -XX:MaxDirectMemorySize=32m -XX:ThreadStackSize=256 -XX:MaxJavaStackTraceDepth=1000" + jvmopts="-Xms32M -Xmx256M -XX:ThreadStackSize=256 -XX:MaxJavaStackTraceDepth=1000000" VESPA_SERVICE_NAME=configproxy export VESPA_SERVICE_NAME @@ -122,7 +122,6 @@ case $1 in java ${jvmopts} \ -XX:+ExitOnOutOfMemoryError $(getJavaOptionsIPV46) \ -Dproxyconfigsources="${configsources}" ${userargs} \ - -XX:ActiveProcessorCount=2 \ -cp $cp com.yahoo.vespa.config.proxy.ProxyServer 19090 echo "Waiting for config proxy to start" diff --git a/logserver/bin/logserver-start.sh b/logserver/bin/logserver-start.sh index 525a4c223bf..9f55e218140 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:MaxDirectMemorySize=76m -XX:MaxJavaStackTraceDepth=1000000" oomopt="-XX:+ExitOnOutOfMemoryError" |