Fix: Support FE_PASSWORD in BE and CN entrypoints (Fixes #66551)

Signed-off-by: arvindksi274-ksolves <[email protected]>

Author: arvindKandpal-ksolves

docker/dockerfiles/be/be_entrypoint.sh

@@ -17,6 +17,10 @@ STARROCKS_ROOT=${STARROCKS_ROOT:-"/opt/starrocks"}
 export STARROCKS_HOME=${STARROCKS_ROOT}/be
 BE_CONFIG=$STARROCKS_HOME/conf/be.conf
 
+MYSQL_PWD_OPT=""
+if [[ -n "$FE_PASSWORD" ]]; then
+    MYSQL_PWD_OPT="-p${FE_PASSWORD}"
+fi
 
 log_stderr()
 {
@@ -47,7 +51,7 @@ update_conf_from_configmap()
 }
 
 show_backends(){
-    timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root --skip-column-names --batch -e 'SHOW BACKENDS;'
+    timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root $MYSQL_PWD_OPT --skip-column-names --batch -e 'SHOW BACKENDS;'
 }
 
 parse_confval_from_cn_conf()
@@ -84,7 +88,7 @@ add_self()
     while true
     do
         log_stderr "Add myself ($MY_SELF:$HEARTBEAT_PORT) into FE ..."
-        timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root --skip-column-names --batch -e "ALTER SYSTEM ADD BACKEND \"$MY_SELF:$HEARTBEAT_PORT\";"
+        timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root $MYSQL_PWD_OPT --skip-column-names --batch -e "ALTER SYSTEM ADD BACKEND \"$MY_SELF:$HEARTBEAT_PORT\";"
         memlist=`show_backends $svc`
         if echo "$memlist" | grep -q -w "$MY_SELF" &>/dev/null ; then
             break;
@@ -162,4 +166,4 @@ while true; do
   sleep_interval=${BE_RESTART_WAIT_SECONDS:-5}
   echo "wait for $sleep_interval seconds ..."
   sleep $sleep_interval
-done
+done

docker/dockerfiles/be/cn_entrypoint.sh

@@ -12,6 +12,10 @@ STARROCKS_ROOT=${STARROCKS_ROOT:-"/opt/starrocks"}
 STARROCKS_HOME=${STARROCKS_ROOT}/cn
 CN_CONFIG=$STARROCKS_HOME/conf/cn.conf
 
+MYSQL_PWD_OPT=""
+if [[ -n "$FE_PASSWORD" ]]; then
+    MYSQL_PWD_OPT="-p${FE_PASSWORD}"
+fi
 
 log_stderr()
 {
@@ -42,7 +46,7 @@ update_conf_from_configmap()
 }
 
 show_compute_nodes(){
-    timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root --skip-column-names --batch -e 'SHOW COMPUTE NODES;'
+    timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root $MYSQL_PWD_OPT --skip-column-names --batch -e 'SHOW COMPUTE NODES;'
 }
 
 parse_confval_from_cn_conf()
@@ -81,12 +85,12 @@ add_self()
         log_stderr "Add myself ($MY_SELF:$HEARTBEAT_PORT) into FE ..."
         # if KUBE_STARROCKS_MULTI_WAREHOUSE environment variable is set, add compute node to the specified warehouse
         if  [[ "x$KUBE_STARROCKS_MULTI_WAREHOUSE" != "x" ]] ; then
-            timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root --skip-column-names --batch -e \
+            timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root $MYSQL_PWD_OPT --skip-column-names --batch -e \
               "CREATE WAREHOUSE IF NOT EXISTS $KUBE_STARROCKS_MULTI_WAREHOUSE;"
-            timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root --skip-column-names --batch -e \
+            timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root $MYSQL_PWD_OPT --skip-column-names --batch -e \
               "ALTER SYSTEM ADD COMPUTE NODE \"$MY_SELF:$HEARTBEAT_PORT\" INTO WAREHOUSE $KUBE_STARROCKS_MULTI_WAREHOUSE;"
         else
-            timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root --skip-column-names --batch -e \
+            timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root $MYSQL_PWD_OPT --skip-column-names --batch -e \
               "ALTER SYSTEM ADD COMPUTE NODE \"$MY_SELF:$HEARTBEAT_PORT\";"
         fi
 
@@ -127,7 +131,7 @@ drop_my_self()
                 return 0
             else
                 log_stderr "drop my self $selfinfo ..."
-                timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root --skip-column-names --batch -e "ALTER SYSTEM DROP COMPUTE NODE \"$selfinfo\";"
+                timeout 15 mysql --connect-timeout 2 -h $svc -P $FE_QUERY_PORT -u root $MYSQL_PWD_OPT --skip-column-names --batch -e "ALTER SYSTEM DROP COMPUTE NODE \"$selfinfo\";"
                 break;
             fi
         else
@@ -172,4 +176,4 @@ if [[ $ret -eq 0 || $ret -eq 137 ]] ; then
 fi
 
 # keep the same return code from start_cn.sh
-exit $ret
+exit $ret