[fix](docker)Fix Dockerfile logic (#16791)

Error log logic fix.
Remove Chinese annotations.
This commit is contained in:
FreeOnePlus
2023-02-16 16:14:43 +08:00
committed by GitHub
parent e2245cbdd3
commit ce7791c362
3 changed files with 16 additions and 19 deletions

View File

@ -138,9 +138,6 @@ docker_setup_db() {
return
fi
for i in {1..300}; do
if [[ $(($i % 20)) == 1 ]]; then
doris_note "ADD FOLLOWER failed, retry."
fi
docker_process_sql <<<"alter system add FOLLOWER '${CURRENT_FE_IP}:${CURRENT_FE_EDIT_PORT}'"
register_fe_status=$?
if [[ $register_fe_status == 0 ]]; then
@ -158,6 +155,9 @@ docker_setup_db() {
doris_warn "FE failed registered!"
fi
fi
if [[ $(($i % 20)) == 1 ]]; then
doris_note "ADD FOLLOWER failed, retry."
fi
sleep 1
done
if ! [[ $is_fe_start ]]; then
@ -173,7 +173,6 @@ check_arg() {
fi
}
# 这里可用 docker_process_sql() 函数封装,为了方便调试,暂未封装
check_fe_status() {
set +e
declare -g CURRENT_FE_ALREADY_EXISTS
@ -182,9 +181,6 @@ check_fe_status() {
return
fi
for i in {1..300}; do
if [[ $(($i % 20)) == 1 ]]; then
doris_note "try session Master FE."
fi
if [[ $1 == true ]]; then
docker_process_sql <<<"show frontends" | grep "[[:space:]]${MASTER_FE_IP}[[:space:]]" | grep "[[:space:]]${MASTER_FE_EDIT_PORT}[[:space:]]"
else
@ -208,6 +204,9 @@ check_fe_status() {
fi
fi
fi
if [[ $(($i % 20)) == 1 ]]; then
doris_note "try session Master FE."
fi
sleep 1
done
}