move IsMasterDown logic to Cluster run loop

signal18 · Jan 3, 2025 · 23bfad2 · 23bfad2
1 parent 68794c2
commit 23bfad2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/cluster/cluster.go b/cluster/cluster.go
@@ -694,6 +694,7 @@ func (cluster *Cluster) Run() {
 				}
 
 				cluster.IsFailable = cluster.GetStatus()
+				cluster.IsMasterDown = cluster.GetMaster() == nil || cluster.GetMaster().IsFailed()
 				// CheckFailed trigger failover code if passing all false positiv and constraints
 				cluster.CheckFailed()
 

diff --git a/cluster/cluster_topo.go b/cluster/cluster_topo.go
@@ -516,7 +516,6 @@ func (cluster *Cluster) AllServersFailed() bool {
 func (cluster *Cluster) TopologyClusterDown() bool {
 	// search for all cluster down
 	if cluster.GetMaster() == nil || cluster.GetMaster().State == stateFailed {
-		cluster.IsMasterDown = true
 		allslavefailed := true
 		for _, s := range cluster.slaves {
 			if s.State != stateFailed && s.State != stateErrorAuth && !s.IsIgnored() {
@@ -544,7 +543,6 @@ func (cluster *Cluster) TopologyClusterDown() bool {
 
 	}
 	cluster.IsDown = false
-	cluster.IsMasterDown = false
 	return false
 }