diff options
-rwxr-xr-x | config-proxy/src/main/sh/vespa-config-ctl.sh | 2 | ||||
-rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 4 | ||||
-rw-r--r-- | filedistribution/src/main/sh/vespa-status-filedistribution.sh | 2 | ||||
-rwxr-xr-x | logserver/bin/logserver-start.sh | 2 | ||||
-rwxr-xr-x | vespaclient-java/src/main/sh/vespa-feeder.sh | 2 | ||||
-rw-r--r-- | vespaclient-java/src/main/sh/vespa-get.sh | 2 | ||||
-rw-r--r-- | vespaclient-java/src/main/sh/vespa-stat.sh | 2 | ||||
-rwxr-xr-x | vespaclient-java/src/main/sh/vespa-summary-benchmark.sh | 2 | ||||
-rwxr-xr-x | vespaclient-java/src/main/sh/vespa-visit-target.sh | 2 | ||||
-rwxr-xr-x | vespaclient-java/src/main/sh/vespa-visit.sh | 2 |
10 files changed, 11 insertions, 11 deletions
diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh index 8d88281207c..669882c11fd 100755 --- a/config-proxy/src/main/sh/vespa-config-ctl.sh +++ b/config-proxy/src/main/sh/vespa-config-ctl.sh @@ -108,7 +108,7 @@ case $1 in if [ "$userargs" == "" ]; then userargs=$services__jvmargs_configproxy fi - jvmopts="-Xms32M -Xmx256M -XX:ThreadStackSize=256 -XX:MaxJavaStackTraceDepth=-1" + jvmopts="-Xms32M -Xmx256M -XX:ThreadStackSize=256 -XX:MaxJavaStackTraceDepth=1000000" VESPA_SERVICE_NAME=configproxy export VESPA_SERVICE_NAME 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 6f0c97f6177..88c8d133d03 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -190,7 +190,7 @@ exec_jsvc () { ${jsvc_opts} \ ${memory_options} \ ${jvm_gcopts} \ - -XX:MaxJavaStackTraceDepth=-1 \ + -XX:MaxJavaStackTraceDepth=1000000 \ -XX:+HeapDumpOnOutOfMemoryError \ -XX:HeapDumpPath="${VESPA_HOME}/var/crash" \ -XX:OnOutOfMemoryError='kill -9 %p' \ @@ -262,7 +262,7 @@ exec $numactlcmd $envcmd java \ -XX:+PreserveFramePointer \ ${memory_options} \ ${jvm_gcopts} \ - -XX:MaxJavaStackTraceDepth=-1 \ + -XX:MaxJavaStackTraceDepth=1000000 \ -XX:+HeapDumpOnOutOfMemoryError \ -XX:HeapDumpPath="${VESPA_HOME}/var/crash" \ -XX:OnOutOfMemoryError='kill -9 %p' \ diff --git a/filedistribution/src/main/sh/vespa-status-filedistribution.sh b/filedistribution/src/main/sh/vespa-status-filedistribution.sh index e6ab8d40678..941319b1b4b 100644 --- a/filedistribution/src/main/sh/vespa-status-filedistribution.sh +++ b/filedistribution/src/main/sh/vespa-status-filedistribution.sh @@ -80,7 +80,7 @@ if [ "$cloudconfig_server__region" != "" ]; then fi defaults="--tenant default --application default --instance default" -jvmoptions="-XX:MaxJavaStackTraceDepth=-1 $(getJavaOptionsIPV46) -Xms48m -Xmx48m" +jvmoptions="-XX:MaxJavaStackTraceDepth=1000000 $(getJavaOptionsIPV46) -Xms48m -Xmx48m" jar="-cp $VESPA_HOME/lib/jars/filedistribution-jar-with-dependencies.jar" exec java $jvmoptions $jar com.yahoo.vespa.filedistribution.status.FileDistributionStatusClient $defaults $environment $region "$@" diff --git a/logserver/bin/logserver-start.sh b/logserver/bin/logserver-start.sh index d72a3f10119..c9e0551648e 100755 --- a/logserver/bin/logserver-start.sh +++ b/logserver/bin/logserver-start.sh @@ -74,7 +74,7 @@ ROOT=${VESPA_HOME%/} export ROOT cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } -addopts="-server -Xms64m -Xmx256m -XX:MaxDirectMemorySize=76m -XX:MaxJavaStackTraceDepth=-1" +addopts="-server -Xms64m -Xmx256m -XX:MaxDirectMemorySize=76m -XX:MaxJavaStackTraceDepth=1000000" oomopt="-XX:OnOutOfMemoryError=kill -9 %p" diff --git a/vespaclient-java/src/main/sh/vespa-feeder.sh b/vespaclient-java/src/main/sh/vespa-feeder.sh index 3c1dfaed60d..557a72c1da5 100755 --- a/vespaclient-java/src/main/sh/vespa-feeder.sh +++ b/vespaclient-java/src/main/sh/vespa-feeder.sh @@ -75,7 +75,7 @@ export MALLOC_ARENA_MAX=1 # Does not need fast allocation java \ -server -enableassertions \ -XX:ThreadStackSize=512 \ --XX:MaxJavaStackTraceDepth=-1 \ +-XX:MaxJavaStackTraceDepth=1000000 \ -Djava.library.path=${VESPA_HOME}/libexec64/native:${VESPA_HOME}/lib64 \ -XX:MaxDirectMemorySize=32m -Djava.awt.headless=true \ -Xms128m -Xmx1024m $(getJavaOptionsIPV46) \ diff --git a/vespaclient-java/src/main/sh/vespa-get.sh b/vespaclient-java/src/main/sh/vespa-get.sh index aef730923de..7c6082f3858 100644 --- a/vespaclient-java/src/main/sh/vespa-get.sh +++ b/vespaclient-java/src/main/sh/vespa-get.sh @@ -74,7 +74,7 @@ export MALLOC_ARENA_MAX=1 #Does not need fast allocation exec java \ -server -enableassertions \ -XX:ThreadStackSize=512 \ --XX:MaxJavaStackTraceDepth=-1 \ +-XX:MaxJavaStackTraceDepth=1000000 \ -Djava.awt.headless=true \ -DVESPA_LOG_LEVEL="all -debug -spam -config -info -event" \ -Xms128m -Xmx1024m $(getJavaOptionsIPV46) \ diff --git a/vespaclient-java/src/main/sh/vespa-stat.sh b/vespaclient-java/src/main/sh/vespa-stat.sh index d8c33d979d0..de57aece5e4 100644 --- a/vespaclient-java/src/main/sh/vespa-stat.sh +++ b/vespaclient-java/src/main/sh/vespa-stat.sh @@ -74,7 +74,7 @@ export MALLOC_ARENA_MAX=1 #Does not need fast allocation exec java \ -server -enableassertions \ -XX:ThreadStackSize=512 \ --XX:MaxJavaStackTraceDepth=-1 \ +-XX:MaxJavaStackTraceDepth=1000000 \ -Djava.awt.headless=true \ -Xms128m -Xmx1024m $(getJavaOptionsIPV46) \ -cp ${VESPA_HOME}/lib/jars/vespaclient-java-jar-with-dependencies.jar com.yahoo.vespastat.Main "$@" diff --git a/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh b/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh index 675b8548d81..3ef5dcd932e 100755 --- a/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh +++ b/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh @@ -75,7 +75,7 @@ export MALLOC_ARENA_MAX=1 # Does not need fast allocation java \ -server -enableassertions \ -XX:ThreadStackSize=512 \ --XX:MaxJavaStackTraceDepth=-1 \ +-XX:MaxJavaStackTraceDepth=1000000 \ -Djava.library.path=${VESPA_HOME}/libexec64/native:${VESPA_HOME}/lib64 \ -XX:MaxDirectMemorySize=32m -Djava.awt.headless=true \ -Xms128m -Xmx1024m $(getJavaOptionsIPV46) \ diff --git a/vespaclient-java/src/main/sh/vespa-visit-target.sh b/vespaclient-java/src/main/sh/vespa-visit-target.sh index 8e57a70b970..d032ad86a54 100755 --- a/vespaclient-java/src/main/sh/vespa-visit-target.sh +++ b/vespaclient-java/src/main/sh/vespa-visit-target.sh @@ -74,7 +74,7 @@ export MALLOC_ARENA_MAX=1 #Does not need fast allocation exec java \ -server -enableassertions \ -XX:ThreadStackSize=512 \ --XX:MaxJavaStackTraceDepth=-1 \ +-XX:MaxJavaStackTraceDepth=1000000 \ -Djava.library.path=${VESPA_HOME}/libexec64/native:${VESPA_HOME}/lib64 \ -XX:MaxDirectMemorySize=32m -Djava.awt.headless=true $(getJavaOptionsIPV46) \ -cp ${VESPA_HOME}/lib/jars/vespaclient-java-jar-with-dependencies.jar:$CLASSPATH com.yahoo.vespavisit.VdsVisitTarget "$@" diff --git a/vespaclient-java/src/main/sh/vespa-visit.sh b/vespaclient-java/src/main/sh/vespa-visit.sh index 5fa9e9451d6..5d47a91ba38 100755 --- a/vespaclient-java/src/main/sh/vespa-visit.sh +++ b/vespaclient-java/src/main/sh/vespa-visit.sh @@ -74,7 +74,7 @@ export MALLOC_ARENA_MAX=1 #Does not need fast allocation exec java \ -server -enableassertions \ -XX:ThreadStackSize=512 \ --XX:MaxJavaStackTraceDepth=-1 \ +-XX:MaxJavaStackTraceDepth=1000000 \ -Djava.library.path=${VESPA_HOME}/libexec64/native:${VESPA_HOME}/lib64 \ -XX:MaxDirectMemorySize=32m -Djava.awt.headless=true \ -Xms128m -Xmx1024m $(getJavaOptionsIPV46) \ |