diff options
Diffstat (limited to 'container-disc/src/main/sh/vespa-start-container-daemon.sh')
-rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 13 |
1 files changed, 9 insertions, 4 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..eb446f9a251 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -39,10 +39,6 @@ CP="${VESPA_HOME}/lib/jars/jdisc_core-jar-with-dependencies.jar" mkdir -p $bundlecachedir || exit 1 printenv > $cfpfile || exit 1 -# ??? TODO ??? XXX ??? -# LANG=en_US.utf8 -# LC_ALL=C - getconfig() { qrstartcfg="" @@ -244,6 +240,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 +255,7 @@ configure_classpath configure_numactl configure_cpu configure_preload +configure_illegal_access exec $numactlcmd $envcmd java \ -Dconfig.id="${VESPA_CONFIG_ID}" \ @@ -265,6 +269,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 \ |