You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2026/04/21 00:33:17 UTC
(doris) branch branch-4.1 updated: branch-4.1: [fix](fe) Fix FE startup argument forwarding #62587 (#62612)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new 057c2d43eff branch-4.1: [fix](fe) Fix FE startup argument forwarding #62587 (#62612)
057c2d43eff is described below
commit 057c2d43eff2967b4fe7807047362ca148d75a68
Author: walter <ma...@selectdb.com>
AuthorDate: Tue Apr 21 08:33:08 2026 +0800
branch-4.1: [fix](fe) Fix FE startup argument forwarding #62587 (#62612)
This picks #62587 to branch-4.1.
---
bin/start_fe.sh | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/bin/start_fe.sh b/bin/start_fe.sh
index 0703cad0606..45b883ef1c5 100755
--- a/bin/start_fe.sh
+++ b/bin/start_fe.sh
@@ -46,9 +46,10 @@ HELPER=''
IMAGE_PATH=''
IMAGE_TOOL=''
OPT_VERSION=''
-METADATA_FAILURE_RECOVERY=''
-RECOVERY_JOURNAL_ID=''
-CLUSTER_SNAPSHOT=''
+declare -a HELPER_ARGS=()
+declare -a METADATA_FAILURE_RECOVERY_ARGS=()
+declare -a RECOVERY_JOURNAL_ID_ARGS=()
+declare -a CLUSTER_SNAPSHOT_ARGS=()
while true; do
case "$1" in
--daemon)
@@ -64,11 +65,11 @@ while true; do
shift
;;
--metadata_failure_recovery)
- METADATA_FAILURE_RECOVERY="-r"
+ METADATA_FAILURE_RECOVERY_ARGS=("-r")
shift
;;
--recovery_journal_id)
- RECOVERY_JOURNAL_ID="--recovery_journal_id $2"
+ RECOVERY_JOURNAL_ID_ARGS=("--recovery_journal_id" "$2")
shift 2
;;
--helper)
@@ -81,7 +82,7 @@ while true; do
shift 2
;;
--cluster_snapshot)
- CLUSTER_SNAPSHOT="--cluster_snapshot $2"
+ CLUSTER_SNAPSHOT_ARGS=("--cluster_snapshot" "$2")
shift 2
;;
--)
@@ -416,7 +417,7 @@ log "start time: ${CUR_DATE}"
if [[ "${HELPER}" != "" ]]; then
# change it to '-helper' to be compatible with code in Frontend
- HELPER="-helper ${HELPER}"
+ HELPER_ARGS=("-helper" "${HELPER}")
fi
if [[ "${OPT_VERSION}" != "" ]]; then
@@ -432,12 +433,12 @@ if [[ "${IMAGE_TOOL}" -eq 1 ]]; then
echo "Internal error, USE IMAGE_TOOL like: ./start_fe.sh --image image_path"
fi
elif [[ "${RUN_DAEMON}" -eq 1 ]]; then
- nohup ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}} -XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p" ${coverage_opt:+${coverage_opt}} org.apache.doris.DorisFE ${HELPER:+${HELPER}} "${METADATA_FAILURE_RECOVERY}" "${RECOVERY_JOURNAL_ID:+${RECOVERY_JOURNAL_ID}}" "${CLUSTER_SNAPSHOT}" "$@" >>"${STDOUT_LOGGER}" 2>&1 </dev/null &
+ nohup ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}} -XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p" ${coverage_opt:+${coverage_opt}} org.apache.doris.DorisFE "${HELPER_ARGS[@]}" "${METADATA_FAILURE_RECOVERY_ARGS[@]}" "${RECOVERY_JOURNAL_ID_ARGS[@]}" "${CLUSTER_SNAPSHOT_ARGS[@]}" "$@" >>"${STDOUT_LOGGER}" 2>&1 </dev/null &
elif [[ "${RUN_CONSOLE}" -eq 1 ]]; then
export DORIS_LOG_TO_STDERR=1
- ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}} -XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p" ${coverage_opt:+${coverage_opt}} org.apache.doris.DorisFE ${HELPER:+${HELPER}} ${OPT_VERSION:+${OPT_VERSION}} "${METADATA_FAILURE_RECOVERY}" "${RECOVERY_JOURNAL_ID:+${RECOVERY_JOURNAL_ID}}" "${CLUSTER_SNAPSHOT}" "$@" >>"${STDOUT_LOGGER}" </dev/null
+ ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}} -XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p" ${coverage_opt:+${coverage_opt}} org.apache.doris.DorisFE "${HELPER_ARGS[@]}" ${OPT_VERSION:+${OPT_VERSION}} "${METADATA_FAILURE_RECOVERY_ARGS[@]}" "${RECOVERY_JOURNAL_ID_ARGS[@]}" "${CLUSTER_SNAPSHOT_ARGS[@]}" "$@" >>"${STDOUT_LOGGER}" </dev/null
else
- ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}} -XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p" ${coverage_opt:+${coverage_opt}} org.apache.doris.DorisFE ${HELPER:+${HELPER}} ${OPT_VERSION:+${OPT_VERSION}} "${METADATA_FAILURE_RECOVERY}" "${RECOVERY_JOURNAL_ID:+${RECOVERY_JOURNAL_ID}}" "${CLUSTER_SNAPSHOT}" "$@" >>"${STDOUT_LOGGER}" 2>&1 </dev/null
+ ${LIMIT:+${LIMIT}} "${JAVA}" ${final_java_opt:+${final_java_opt}} -XX:-OmitStackTraceInFastThrow -XX:OnOutOfMemoryError="kill -9 %p" ${coverage_opt:+${coverage_opt}} org.apache.doris.DorisFE "${HELPER_ARGS[@]}" ${OPT_VERSION:+${OPT_VERSION}} "${METADATA_FAILURE_RECOVERY_ARGS[@]}" "${RECOVERY_JOURNAL_ID_ARGS[@]}" "${CLUSTER_SNAPSHOT_ARGS[@]}" "$@" >>"${STDOUT_LOGGER}" 2>&1 </dev/null
fi
if [[ "${OPT_VERSION}" != "" ]]; then
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org