aboutsummaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2021-11-29 00:54:54 +0100
committergjoranv <gv@verizonmedia.com>2021-11-29 00:54:54 +0100
commitd4bbdff81aa2d5bc5bae5e2ee8dc1012c1503186 (patch)
treeb4046b7edc431b60a87f41403bf592809a5e085a /container-disc
parent434fd1cdb6dee96513779a4a2a6719e9bb4c8b62 (diff)
Use java option '--illegal-access=debug' for jdk 11.
Diffstat (limited to 'container-disc')
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh9
1 files changed, 9 insertions, 0 deletions
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 d465edb3c39..a8dff9f3f77 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -244,6 +244,13 @@ import_cfg_var () {
fi
}
+# TODO Vespa 8: Remove when all containers use JDK 17
+configure_illegal_access() {
+ if [[ "$VESPA_JDK_VERSION" = "11" ]]; then
+ illegal_access_option="--illegal-access=debug"
+ fi
+}
+
getconfig
configure_memory
configure_gcopts
@@ -252,6 +259,7 @@ configure_classpath
configure_numactl
configure_cpu
configure_preload
+configure_illegal_access
exec $numactlcmd $envcmd java \
-Dconfig.id="${VESPA_CONFIG_ID}" \
@@ -265,6 +273,7 @@ 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_option} \
--add-opens=java.base/java.io=ALL-UNNAMED \
--add-opens=java.base/java.lang=ALL-UNNAMED \
--add-opens=java.base/java.net=ALL-UNNAMED \