Skip to content

Commit

Permalink
[enhancement](jdk) support doris fe running in jvm with jdk16+ (apach…
Browse files Browse the repository at this point in the history
  • Loading branch information
caiconghui authored Nov 15, 2023
1 parent df867a1 commit f87c807
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
8 changes: 7 additions & 1 deletion bin/start_fe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,13 @@ java_version="$(
jdk_version "${JAVA}"
)"
final_java_opt="${JAVA_OPTS}"
if [[ "${java_version}" -gt 8 ]]; then
if [[ "${java_version}" -ge 16 ]]; then
if [[ -z "${JAVA_OPTS_FOR_JDK_16}" ]]; then
echo "JAVA_OPTS_FOR_JDK_16 is not set in fe.conf" >>"${LOG_DIR}/fe.out"
exit 1
fi
final_java_opt="${JAVA_OPTS_FOR_JDK_16}"
elif [[ "${java_version}" -gt 8 ]]; then
if [[ -z "${JAVA_OPTS_FOR_JDK_9}" ]]; then
echo "JAVA_OPTS_FOR_JDK_9 is not set in fe.conf" >>"${LOG_DIR}/fe.out"
exit 1
Expand Down
4 changes: 4 additions & 0 deletions conf/fe.conf
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ JAVA_OPTS="-Dsun.security.krb5.debug=true -Djavax.security.auth.useSubjectCredsO
# For jdk 9+, this JAVA_OPTS will be used as default JVM options
JAVA_OPTS_FOR_JDK_9="-Dsun.security.krb5.debug=true -Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx8192m -XX:SurvivorRatio=8 -XX:MaxTenuringThreshold=7 -XX:+CMSClassUnloadingEnabled -XX:-CMSParallelRemarkEnabled -XX:CMSInitiatingOccupancyFraction=80 -XX:SoftRefLRUPolicyMSPerMB=0 -Xlog:gc*:$DORIS_HOME/log/fe.gc.log.$CUR_DATE:time"

# For jdk 16+, this JAVA_OPTS will be used as default JVM options
JAVA_OPTS_FOR_JDK_16="-Djavax.security.auth.useSubjectCredsOnly=false -XX:+UseZGC -Xmx8192m -Xms8192m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$DORIS_HOME/log/ -Xlog:gc*:$DORIS_HOME/log/fe.gc.log.$CUR_DATE:time --add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED --add-opens java.base/java.security=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.ref=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED"


##
## the lowercase properties are read by main program.
##
Expand Down

0 comments on commit f87c807

Please sign in to comment.