summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2021-10-27 14:57:50 +0200
committerGitHub <noreply@github.com>2021-10-27 14:57:50 +0200
commit0603a322c6a5530233c5f3655ffef899c716185d (patch)
tree9368813b807cef438107b436493c29cafaec3e08
parent3d8fdedcf1f85a2a95df0a8981fb79b043c5231f (diff)
parentb01a4463d08990dafd03078da6512cf079b79c65 (diff)
Merge pull request #19745 from vespa-engine/hmusum/remove-unsupported-option-on-jdk-17
Remove JVM option that is unsupported on JDK 17
-rwxr-xr-xconfigserver/src/main/sh/start-configserver1
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh1
-rwxr-xr-xstandalone-container/src/main/sh/standalone-container.sh1
3 files changed, 0 insertions, 3 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index b3b449fb5a1..317af4b2fea 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -171,7 +171,6 @@ vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \
-XX:-OmitStackTraceInFastThrow \
-XX:MaxJavaStackTraceDepth=1000000 \
$jvmargs \
- --illegal-access=warn \
--add-opens=java.base/java.io=ALL-UNNAMED \
--add-opens=java.base/java.lang=ALL-UNNAMED \
--add-opens=java.base/java.net=ALL-UNNAMED \
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 28c2c00a921..7f281d02fd3 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -195,7 +195,6 @@ exec $numactlcmd $envcmd java \
-XX:HeapDumpPath="${VESPA_HOME}/var/crash" \
-XX:ErrorFile="${VESPA_HOME}/var/crash/hs_err_pid%p.log" \
-XX:+ExitOnOutOfMemoryError \
- --illegal-access=warn \
--add-opens=java.base/java.io=ALL-UNNAMED \
--add-opens=java.base/java.lang=ALL-UNNAMED \
--add-opens=java.base/java.net=ALL-UNNAMED \
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh
index 9f862d2b14a..9e888bdfea2 100755
--- a/standalone-container/src/main/sh/standalone-container.sh
+++ b/standalone-container/src/main/sh/standalone-container.sh
@@ -163,7 +163,6 @@ StartCommand() {
-XX:+HeapDumpOnOutOfMemoryError \
-XX:HeapDumpPath="$VESPA_HOME/var/crash" \
-XX:+ExitOnOutOfMemoryError \
- --illegal-access=warn \
--add-opens=java.base/java.io=ALL-UNNAMED \
--add-opens=java.base/java.lang=ALL-UNNAMED \
--add-opens=java.base/java.net=ALL-UNNAMED \