Skip to content

Commit ae2fb25

Browse files
authored
[fix](java) should use JAVA_OPTS_FOR_JDK_17 instead of JAVA_OPTS (#47913)
### What problem does this PR solve? Related PR: #47299 Problem Summary: The master branch only support java 17+, so should remote all `JAVA_OPTS` and use `JAVA_OPTS_FOR_JDK_17`
1 parent a14e95e commit ae2fb25

5 files changed

Lines changed: 10 additions & 13 deletions

File tree

‎be/src/util/jni-util.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ const std::string GetKerb5ConfPath() {
107107
setenv("CLASSPATH", classpath.c_str(), 0);
108108

109109
// LIBHDFS_OPTS
110-
const std::string java_opts = getenv("JAVA_OPTS") ? getenv("JAVA_OPTS") : "";
110+
const std::string java_opts =
111+
getenv("JAVA_OPTS_FOR_JDK_17") ? getenv("JAVA_OPTS_FOR_JDK_17") : "";
111112
std::string libhdfs_opts =
112113
fmt::format("{} -Djava.library.path={}/lib/hadoop_hdfs/native:{} ", java_opts,
113114
getenv("DORIS_HOME"), getenv("DORIS_HOME") + std::string("/lib"));
@@ -123,7 +124,7 @@ const std::string GetKerb5ConfPath() {
123124
if (rv == 0) {
124125
std::vector<std::string> options;
125126

126-
char* java_opts = getenv("JAVA_OPTS");
127+
char* java_opts = getenv("JAVA_OPTS_FOR_JDK_17");
127128
if (java_opts == nullptr) {
128129
options = {
129130
GetDorisJNIClasspathOption(), fmt::format("-Xmx{}", "1g"),
@@ -216,7 +217,7 @@ Status JniLocalFrame::push(JNIEnv* env, int max_local_ref) {
216217
}
217218

218219
void JniUtil::parse_max_heap_memory_size_from_jvm(JNIEnv* env) {
219-
// The start_be.sh would set JAVA_OPTS inside LIBHDFS_OPTS
220+
// The start_be.sh would set JAVA_OPTS_FOR_JDK_17 inside LIBHDFS_OPTS
220221
std::string java_opts = getenv("LIBHDFS_OPTS") ? getenv("LIBHDFS_OPTS") : "";
221222
std::istringstream iss(java_opts);
222223
std::string opt;

‎bin/start_be.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ if [[ -f "${DORIS_HOME}/conf/hdfs-site.xml" ]]; then
384384
export LIBHDFS3_CONF="${DORIS_HOME}/conf/hdfs-site.xml"
385385
fi
386386

387-
# check java version and choose correct JAVA_OPTS
387+
# check java version and choose correct JAVA_OPTS_FOR_JDK_17
388388
java_version="$(
389389
set -e
390390
jdk_version "${JAVA_HOME}/bin/java"
@@ -412,12 +412,13 @@ if [[ "${MACHINE_OS}" == "Darwin" ]]; then
412412
fi
413413

414414
if [[ -n "${JAVA_OPTS_FOR_JDK_17}" ]] && ! echo "${JAVA_OPTS_FOR_JDK_17}" | grep "${max_fd_limit/-/\\-}" >/dev/null; then
415-
export JAVA_OPTS="${JAVA_OPTS_FOR_JDK_17} ${max_fd_limit}"
415+
export JAVA_OPTS_FOR_JDK_17="${JAVA_OPTS_FOR_JDK_17} ${max_fd_limit}"
416416
fi
417417
fi
418418

419419
# set LIBHDFS_OPTS for hadoop libhdfs
420420
export LIBHDFS_OPTS="${final_java_opt}"
421+
export JAVA_OPTS="${final_java_opt}"
421422

422423
# log "CLASSPATH: ${CLASSPATH}"
423424
# log "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}"

‎bin/start_fe.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ export DORIS_HOME
9191

9292
# export env variables from fe.conf
9393
#
94-
# JAVA_OPTS
94+
# JAVA_OPTS_FOR_JDK_17
9595
# LOG_DIR
9696
# PID_DIR
97-
export JAVA_OPTS="-Xmx1024m"
97+
export JAVA_OPTS_FOR_JDK_17="-Xmx1024m"
9898
export LOG_DIR="${DORIS_HOME}/log"
9999
PID_DIR="$(
100100
cd "${curdir}"
@@ -204,6 +204,7 @@ else
204204
fi
205205
log "Using Java version ${java_version}"
206206
log "${final_java_opt}"
207+
export JAVA_OPTS="${final_java_opt}"
207208

208209
# add libs to CLASSPATH
209210
DORIS_FE_JAR=

‎conf/be.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ CUR_DATE=`date +%Y%m%d-%H%M%S`
2020
# Log dir
2121
LOG_DIR="${DORIS_HOME}/log/"
2222

23-
# For jdk 8
24-
JAVA_OPTS="-Dfile.encoding=UTF-8 -Xmx2048m -DlogPath=$LOG_DIR/jni.log -Xloggc:$LOG_DIR/be.gc.log.$CUR_DATE -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=50M -Djavax.security.auth.useSubjectCredsOnly=false -Dsun.security.krb5.debug=true -Dsun.java.command=DorisBE -XX:-CriticalJNINatives"
25-
2623
# For jdk 17, this JAVA_OPTS will be used as default JVM options
2724
JAVA_OPTS_FOR_JDK_17="-Dfile.encoding=UTF-8 -Djol.skipHotspotSAAttach=true -Xmx2048m -DlogPath=$LOG_DIR/jni.log -Xlog:gc*:$LOG_DIR/be.gc.log.$CUR_DATE:time,uptime:filecount=10,filesize=50M -Djavax.security.auth.useSubjectCredsOnly=false -Dsun.security.krb5.debug=true -Dsun.java.command=DorisBE -XX:-CriticalJNINatives -XX:+IgnoreUnrecognizedVMOptions --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.nio.cs=ALL-UNNAMED --add-opens=java.base/sun.security.action=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED -Darrow.enable_null_check_for_get=false"
2825

‎conf/fe.conf‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ CUR_DATE=`date +%Y%m%d-%H%M%S`
2626
# Log dir
2727
LOG_DIR = ${DORIS_HOME}/log
2828

29-
# For jdk 8
30-
JAVA_OPTS="-Dfile.encoding=UTF-8 -Djavax.security.auth.useSubjectCredsOnly=false -Xss4m -Xmx8192m -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintClassHistogramAfterFullGC -Xloggc:$LOG_DIR/log/fe.gc.log.$CUR_DATE -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=50M -Dlog4j2.formatMsgNoLookups=true"
31-
3229
# For jdk 17, this JAVA_OPTS will be used as default JVM options
3330
JAVA_OPTS_FOR_JDK_17="-Dfile.encoding=UTF-8 -Djavax.security.auth.useSubjectCredsOnly=false -Xmx8192m -Xms8192m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$LOG_DIR -Xlog:gc*,classhisto*=trace:$LOG_DIR/fe.gc.log.$CUR_DATE:time,uptime:filecount=10,filesize=50M --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.ref=ALL-UNNAMED"
3431

0 commit comments

Comments
 (0)