From ce7791c362a4cff70158e668c0437f1e0a216fe1 Mon Sep 17 00:00:00 2001
From: FreeOnePlus <54164178+FreeOnePlus@users.noreply.github.com>
Date: Thu, 16 Feb 2023 16:14:43 +0800
Subject: [PATCH] [fix](docker)Fix Dockerfile logic (#16791)

Error log logic fix.
Remove Chinese annotations.
---
 docker/runtime/be/resource/init_be.sh         | 21 +++++++++----------
 docker/runtime/broker/resource/init_broker.sh |  1 -
 docker/runtime/fe/resource/init_fe.sh         | 13 ++++++------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/docker/runtime/be/resource/init_be.sh b/docker/runtime/be/resource/init_be.sh
index 45ec74a5b1..ee1d8f9538 100644
--- a/docker/runtime/be/resource/init_be.sh
+++ b/docker/runtime/be/resource/init_be.sh
@@ -135,9 +135,6 @@ register_be_to_fe() {
   # check fe status
   local is_fe_start=false
   for i in {1..300}; do
-    if [[ $(( $i % 20 )) == 1 ]]; then
-      doris_note "Register BE to FE is failed. retry."
-    fi
     docker_process_sql <<<"alter system add backend '${BE_HOST_IP}:${BE_HEARTBEAT_PORT}'"
     register_be_status=$?
     if [[ $register_be_status == 0 ]]; then
@@ -155,6 +152,9 @@ register_be_to_fe() {
           doris_warn "BE failed registered to FE!"
       fi
     fi
+    if [[ $(( $i % 20 )) == 1 ]]; then
+      doris_note "Register BE to FE is failed. retry."
+    fi
     sleep 1
   done
   if ! [[ $is_fe_start ]]; then
@@ -170,17 +170,9 @@ check_arg() {
   fi
 }
 
-# 这里可用 docker_process_sql() 函数封装，为了方便调试，暂未封装
 check_be_status() {
   set +e
   for i in {1..300}; do
-    if [[ $(( $i % 20 )) == 1 ]]; then
-      if [[ $1 == true ]]; then
-        doris_note "MASTER FE is not started. retry."
-      else
-        doris_note "BE is not register. retry."
-      fi
-    fi
     if [[ $1 == true ]]; then
       docker_process_sql <<<"show frontends" | grep "[[:space:]]${MASTER_FE_IP}[[:space:]]"
     else
@@ -196,6 +188,13 @@ check_be_status() {
       fi
       break
     fi
+    if [[ $(( $i % 20 )) == 1 ]]; then
+      if [[ $1 == true ]]; then
+        doris_note "MASTER FE is not started. retry."
+      else
+        doris_note "BE is not register. retry."
+      fi
+    fi
     sleep 1
   done
 }
diff --git a/docker/runtime/broker/resource/init_broker.sh b/docker/runtime/broker/resource/init_broker.sh
index 227cbac1ef..958449d835 100644
--- a/docker/runtime/broker/resource/init_broker.sh
+++ b/docker/runtime/broker/resource/init_broker.sh
@@ -147,7 +147,6 @@ check_arg() {
   fi
 }
 
-# 这里可用 docker_process_sql() 函数封装，为了方便调试，暂未封装
 check_broker_status() {
   set +e
   for i in {1..300}; do
diff --git a/docker/runtime/fe/resource/init_fe.sh b/docker/runtime/fe/resource/init_fe.sh
index bcc546553d..3e80cb55cd 100644
--- a/docker/runtime/fe/resource/init_fe.sh
+++ b/docker/runtime/fe/resource/init_fe.sh
@@ -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
 }