MySQL multi source failed to set standalone server on rejoining old l…

…eader
signal18 · Jan 6, 2023 · 55ed1ce · 55ed1ce
1 parent 695a5a4
commit 55ed1ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cluster/cluster_topo.go b/cluster/cluster_topo.go
@@ -185,7 +185,7 @@ func (cluster *Cluster) TopologyDiscover(wcg *sync.WaitGroup) error {
 				if cluster.IsActive() && cluster.master != nil && cluster.GetTopology() == topoMasterSlave && cluster.Servers[k].URL != cluster.master.URL {
 					//Extra master in master slave topology rejoin it after split brain
 					cluster.SetState("ERR00063", state.State{ErrType: "ERROR", ErrDesc: fmt.Sprintf(clusterError["ERR00063"]), ErrFrom: "TOPO"})
-					//	cluster.Servers[k].RejoinMaster() /* remove for rolling restart , wrongly rejoin server as master before just after swithover while the server is just stopping
+					//	cluster.Servers[k].RejoinMaster() /* remove for rolling restart , wrongly rejoin server as master before just after swithover while the server is just stopping */
 				} else {
 					cluster.master = cluster.Servers[k]
 					cluster.master.SetMaster()

diff --git a/cluster/srv.go b/cluster/srv.go
@@ -443,7 +443,7 @@ func (server *ServerMonitor) Ping(wg *sync.WaitGroup) {
 	//  1617 is no multi source channel found
 	noChannel := false
 	if errss != nil {
-		if strings.Contains(errss.Error(), "1617") {
+		if strings.Contains(errss.Error(), "1617") || strings.Contains(errss.Error(), "3074") {
 			// This is a special case when using muti source there is a error instead of empty resultset when no replication is defined on channel
 			//	server.ClusterGroup.LogPrintf(LvlInfo, " server: %s replication no channel err 1617 %s ", server.URL, errss)
 			noChannel = true