summaryrefslogtreecommitdiffstats
path: root/vespaclient-java/src
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-07-05 12:24:22 +0200
committergjoranv <gv@oath.com>2018-07-05 12:24:22 +0200
commitde92309965a141265c19289bbd2a62dff427a0c2 (patch)
treea75f31e00ee048493a7e70516c3ba921f1fb49c4 /vespaclient-java/src
parent49535dc705de69fd225e38238e15f0dd4a14b74f (diff)
Set MaxJavaStackTraceDepth to a value legal for all JVM versions.
- On JDK 9+, -1 is invalid, and 0 really means zero.
Diffstat (limited to 'vespaclient-java/src')
-rwxr-xr-xvespaclient-java/src/main/sh/vespa-feeder.sh2
-rw-r--r--vespaclient-java/src/main/sh/vespa-get.sh2
-rw-r--r--vespaclient-java/src/main/sh/vespa-stat.sh2
-rwxr-xr-xvespaclient-java/src/main/sh/vespa-summary-benchmark.sh2
-rwxr-xr-xvespaclient-java/src/main/sh/vespa-visit-target.sh2
-rwxr-xr-xvespaclient-java/src/main/sh/vespa-visit.sh2
6 files changed, 6 insertions, 6 deletions
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) \