pass FE_MASTER_PORT set fe_mysql_port execute sql

Author: dyrnq

rootfs/docker-entrypoint.sh

@@ -57,16 +57,15 @@ _main() {
 if grep -q -i "stand" <<< "${RUN_MODE}"; then
     touch /etc/s6-overlay/s6-rc.d/user/contents.d/be
     touch /etc/s6-overlay/s6-rc.d/user/contents.d/fe
-fi
-
-if grep -q -i "fe" <<< "${RUN_MODE}"; then
+    touch /etc/s6-overlay/s6-rc.d/user/contents.d/cluster
+elif grep -q -i "fe" <<< "${RUN_MODE}"; then
     touch /etc/s6-overlay/s6-rc.d/user/contents.d/fe
-fi
-
-if grep -q -i "be" <<< "${RUN_MODE}"; then
+    touch /etc/s6-overlay/s6-rc.d/user/contents.d/cluster
+elif grep -q -i "be" <<< "${RUN_MODE}"; then
     touch /etc/s6-overlay/s6-rc.d/user/contents.d/be
+    touch /etc/s6-overlay/s6-rc.d/user/contents.d/cluster
 fi
-touch /etc/s6-overlay/s6-rc.d/user/contents.d/cluster
+
 
 
     exec /init

rootfs/etc/s6-overlay/s6-rc.d/cluster/run

@@ -6,6 +6,12 @@
 
 set -eo pipefail
 
+
+fe_mysql_port="9030"
+if [ -n "${FE_MASTER_PORT}" ]; then
+    fe_mysql_port="${FE_MASTER_PORT}"
+fi
+
 if grep -q -i "stand" <<< "${RUN_MODE}"; then
 
 
@@ -17,11 +23,11 @@ if grep -q -i "stand" <<< "${RUN_MODE}"; then
     fi
 
 
-    wait4x --timeout 86400s mysql "root@tcp(127.0.0.1:9030)/" && \
+    wait4x --timeout 86400s mysql "root@tcp(127.0.0.1:${fe_mysql_port})/" && \
     (
         ## check if the backend is already added
-        if ! mysql -uroot -P9030 -h127.0.0.1 -e "show backends" | grep -q -E "${join_backend}.*9050"; then
-            mysql -uroot -P9030 -h127.0.0.1 -e "ALTER SYSTEM ADD BACKEND '${join_backend}:9050'"
+        if ! mysql -uroot -P${fe_mysql_port} -h127.0.0.1 -e "show backends" | grep -q -E "${join_backend}.*9050"; then
+            mysql -uroot -P${fe_mysql_port} -h127.0.0.1 -e "ALTER SYSTEM ADD BACKEND '${join_backend}:9050'"
         fi
     )
 fi
@@ -30,7 +36,7 @@ fi
 ## //TODO
 ## will ignore BE_SERVERS
 ## will ignore FQDN
-## will ignore FE_MASTER_PORT //TODO
+
 
 
 if grep -q -i "fe" <<< "${RUN_MODE}"; then
@@ -50,6 +56,7 @@ if [ -n "${FE_SERVERS}" ]; then
 
     # specific for k8s sts pod, because the FE_ID cant set var ENV
     # so we need to get the index from hostname
+    # TODO need make sure it is indeed in k8s environment
     if [ -z "${FE_ID}" ]; then
         HOSTNAME="$(hostname -s)"
         if [[ $HOSTNAME =~ (.*)-([0-9]+)$ ]]; then
@@ -82,7 +89,7 @@ if [ -n "${FE_SERVERS}" ]; then
     done
 fi
 
-wait4x --timeout 86400s mysql "root@tcp(${fe_master}:9030)/" && \
+wait4x --timeout 86400s mysql "root@tcp(${fe_master}:${fe_mysql_port})/" && \
 (
     for k in "${!fe_join[@]}"; do
         val="${fe_join[$k]}";
@@ -92,15 +99,13 @@ wait4x --timeout 86400s mysql "root@tcp(${fe_master}:9030)/" && \
         # echo "${val_grep}"
         # echo "###########################################"
         ## check if the frontend is already added
-        if ! mysql -uroot -P9030 -h${fe_master} -e "show frontends;" | grep -q -E "${val_grep}"; then
-            mysql -uroot -P9030 -h${fe_master} -e "ALTER SYSTEM ADD FOLLOWER '${val}'"
+        if ! mysql -uroot -P${fe_mysql_port} -h${fe_master} -e "show frontends;" | grep -q -E "${val_grep}"; then
+            mysql -uroot -P${fe_mysql_port} -h${fe_master} -e "ALTER SYSTEM ADD FOLLOWER '${val}'"
         fi
     done
 )
 
-# mysql -uroot -P9030 -hfe-01 -e "ALTER SYSTEM ADD FOLLOWER 'fe-02:9010'"
-# mysql -uroot -P9030 -hfe-01 -e "ALTER SYSTEM ADD FOLLOWER 'fe-03:9010'"
-# mysql -uroot -P9030 -hfe-01 -e "ALTER SYSTEM DROP FOLLOWER 'fe-04:9010'"
+
 
 
 fi
@@ -132,7 +137,7 @@ if [ -n "${FE_SERVERS}" ]; then
     done
 fi
 
-wait4x --timeout 86400s mysql "root@tcp(${fe_master}:9030)/" && \
+wait4x --timeout 86400s mysql "root@tcp(${fe_master}:${fe_mysql_port})/" && \
 (
     val="";
 
@@ -143,8 +148,8 @@ wait4x --timeout 86400s mysql "root@tcp(${fe_master}:9030)/" && \
     fi
 
     val_grep=${val//:/.*}
-    if ! mysql -uroot -P9030 -h${fe_master} -e "show backends;" | grep -q -E "${val_grep}"; then
-        mysql -uroot -P9030 -h${fe_master} -e "ALTER SYSTEM ADD BACKEND '${val}'"
+    if ! mysql -uroot -P${fe_mysql_port} -h${fe_master} -e "show backends;" | grep -q -E "${val_grep}"; then
+        mysql -uroot -P${fe_mysql_port} -h${fe_master} -e "ALTER SYSTEM ADD BACKEND '${val}'"
     fi
 )