From a79927fe6775105288f6e8d08485f92c771cc7d8 Mon Sep 17 00:00:00 2001
From: catpineapple <1391869588@qq.com>
Date: Mon, 29 Jan 2024 10:38:50 +0800
Subject: [PATCH] entrypoint_fix

---
 docker/be/resource/be_entrypoint.sh | 7 +++++++
 docker/fe/resource/fe_entrypoint.sh | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/docker/be/resource/be_entrypoint.sh b/docker/be/resource/be_entrypoint.sh
index 67f8dd08..26bac29a 100755
--- a/docker/be/resource/be_entrypoint.sh
+++ b/docker/be/resource/be_entrypoint.sh
@@ -113,6 +113,13 @@ add_self()
         # check fe cluster have master, if fe have not master wait.
         fe_memlist=`show_frontends $svc`
         local leader=`echo "$fe_memlist" | grep '\<FOLLOWER\>' | awk -F '\t' '{if ($8=="true") print $2}'`
+
+        if [[ "x$leader" == "x" ]]; then
+           # compatible 2.1.0
+           log_stderr "probe number 9!"
+           leader=`echo "$fe_memlist" | grep '\<FOLLOWER\>' | awk -F '\t' '{if ($9=="true") print $2}'`
+        fi
+
         if [[ "x$leader" != "x" ]]; then
             log_stderr "Check myself ($MY_SELF:$HEARTBEAT_PORT)  not exist in FE and fe have leader register myself..."
 
diff --git a/docker/fe/resource/fe_entrypoint.sh b/docker/fe/resource/fe_entrypoint.sh
index 88954f14..0c5b606a 100755
--- a/docker/fe/resource/fe_entrypoint.sh
+++ b/docker/fe/resource/fe_entrypoint.sh
@@ -177,6 +177,13 @@ probe_master_for_pod()
     do
         memlist=`show_frontends $svc`
 	    local master=`echo "$memlist" | grep '\<FOLLOWER\>' | awk -F '\t' '{if ($8=="true") print $2}'`
+
+        if [[ "x$master" == "x" ]]; then
+           # compatible 2.1.0
+           log_stderr "probe number 9!"
+           master=`echo "$memlist" | grep '\<FOLLOWER\>' | awk -F '\t' '{if ($9=="true") print $2}'`
+        fi
+
         if [[ "x$master" != "x" ]] ; then
             # has master, done
             log_stderr "Find master: $master!"