Don't add the node into the failover candidates if it's not a master …

…node
apache · Apr 15, 2024 · dc14323 · dc14323
1 parent 77db1c4
commit dc14323
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/controller/probe/cluster.go b/controller/probe/cluster.go
@@ -94,6 +94,11 @@ func (c *Cluster) increaseFailureCount(index int, node *metadata.NodeInfo) int64
 	count := c.failureCounts[node.Addr]
 	c.failureMu.Unlock()
 
+	/// don't add the node into the failover candidates if it's not a master node
+	if node.Role != metadata.RoleMaster {
+		return count
+	}
+
 	if count%c.failOver.Config().MaxPingCount == 0 {
 		err := c.failOver.AddNode(c.namespace, c.cluster, index, *node, failover.AutoType)
 		if err != nil {

diff --git a/server/cluster.go b/server/cluster.go
@@ -166,7 +166,7 @@ func (handler *ClusterHandler) Remove(c *gin.Context) {
 	responseOK(c, "ok")
 }
 
-func (hander *ClusterHandler) Import(c *gin.Context) {
+func (handler *ClusterHandler) Import(c *gin.Context) {
 	namespace := c.Param("namespace")
 	clusterName := c.Param("cluster")
 	var req struct {
@@ -198,7 +198,7 @@ func (hander *ClusterHandler) Import(c *gin.Context) {
 	clusterInfo.SetPassword(req.Password)
 
 	clusterInfo.Name = clusterName
-	if err := hander.storage.CreateCluster(c, namespace, clusterInfo); err != nil {
+	if err := handler.storage.CreateCluster(c, namespace, clusterInfo); err != nil {
 		responseError(c, err)
 		return
 	}