Merge pull request #3 from luky116/IsEligibleForMasterElection

use Is_eligible_for_master_election in sentinel
luky116 · Jun 28, 2024 · 63bb2ee · 63bb2ee
2 parents 444f00a + dce0e1d
commit 63bb2ee
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/codis/pkg/models/group.go b/codis/pkg/models/group.go
@@ -31,7 +31,7 @@ func (g *Group) SelectNewMaster() (string, int) {
 	var newMasterIndex = -1
 
 	for index, server := range g.Servers {
-		if index == 0 || server.State != GroupServerStateNormal {
+		if index == 0 || server.State != GroupServerStateNormal || !server.IsEligibleForMasterElection {
 			continue
 		}
 
@@ -84,8 +84,9 @@ type GroupServer struct {
 	// master or slave
 	Role GroupServerRole `json:"role"`
 	// If it is a master node, take the master_repl_offset field, otherwise take the slave_repl_offset field
-	DbBinlogFileNum uint64 `json:"binlog_file_num"` // db0
-	DbBinlogOffset  uint64 `json:"binlog_offset"`   // db0
+	DbBinlogFileNum             uint64 `json:"binlog_file_num"` // db0
+	DbBinlogOffset              uint64 `json:"binlog_offset"`   // db0
+	IsEligibleForMasterElection bool   `json:"is_eligible_for_master_election"`
 
 	// Monitoring status, 0 normal, 1 subjective offline, 2 actual offline
 	// If marked as 2 , no service is provided

diff --git a/codis/pkg/topom/topom_group.go b/codis/pkg/topom/topom_group.go
@@ -403,6 +403,7 @@ func (s *Topom) tryFixReplicationRelationship(group *models.Group, groupServer *
 	groupServer.Role = models.GroupServerRole(state.Replication.Role)
 	groupServer.DbBinlogFileNum = state.Replication.DbBinlogFileNum
 	groupServer.DbBinlogOffset = state.Replication.DbBinlogOffset
+	groupServer.IsEligibleForMasterElection = state.Replication.IsEligibleForMasterElection
 	groupServer.Action.State = models.ActionSynced
 	err = s.storeUpdateGroup(group)
 	// clean cache whether err is nil or not

diff --git a/codis/pkg/topom/topom_sentinel.go b/codis/pkg/topom/topom_sentinel.go
@@ -48,7 +48,7 @@ func (s *Topom) CheckStateAndSwitchSlavesAndMasters(filter func(index int, g *mo
 
 	if len(recoveredGroupServersState) > 0 {
 		// offline GroupServer's service has recovered, check and fix it's master-slave replication relationship
-		s.tryFixReplicationRelationships(ctx, recoveredGroupServersState,len(masterOfflineGroups))
+		s.tryFixReplicationRelationships(ctx, recoveredGroupServersState, len(masterOfflineGroups))
 	}
 
 	return nil
@@ -92,6 +92,7 @@ func (s *Topom) checkAndUpdateGroupServerState(conf *Config, group *models.Group
 			groupServer.Role = models.GroupServerRole(state.Replication.Role)
 			groupServer.DbBinlogFileNum = state.Replication.DbBinlogFileNum
 			groupServer.DbBinlogOffset = state.Replication.DbBinlogOffset
+			groupServer.IsEligibleForMasterElection = state.Replication.IsEligibleForMasterElection
 			groupServer.Action.State = models.ActionSynced
 		}
 	}

diff --git a/codis/pkg/utils/redis/sentinel.go b/codis/pkg/utils/redis/sentinel.go
@@ -65,14 +65,15 @@ func (i *InfoSlave) UnmarshalJSON(b []byte) error {
 }
 
 type InfoReplication struct {
-	Role             string      `json:"role"`
-	ConnectedSlaves  int         `json:"connected_slaves"`
-	MasterHost       string      `json:"master_host"`
-	MasterPort       string      `json:"master_port"`
-	MasterLinkStatus string      `json:"master_link_status"` // down; up
-	DbBinlogFileNum  uint64      `json:"binlog_file_num"`    // db0
-	DbBinlogOffset   uint64      `json:"binlog_offset"`      // db0
-	Slaves           []InfoSlave `json:"-"`
+	Role                        string      `json:"role"`
+	ConnectedSlaves             int         `json:"connected_slaves"`
+	MasterHost                  string      `json:"master_host"`
+	MasterPort                  string      `json:"master_port"`
+	MasterLinkStatus            string      `json:"master_link_status"` // down; up
+	DbBinlogFileNum             uint64      `json:"binlog_file_num"`    // db0
+	DbBinlogOffset              uint64      `json:"binlog_offset"`      // db0
+	IsEligibleForMasterElection bool        `json:"is_eligible_for_master_election"`
+	Slaves                      []InfoSlave `json:"-"`
 }
 
 type ReplicationState struct {
@@ -108,6 +109,7 @@ func (i *InfoReplication) UnmarshalJSON(b []byte) error {
 	i.MasterPort = kvmap["master_host"]
 	i.MasterHost = kvmap["master_port"]
 	i.MasterLinkStatus = kvmap["master_link_status"]
+	i.IsEligibleForMasterElection = kvmap["is_eligible_for_master_election"] == "true"
 
 	if val, ok := kvmap["binlog_file_num"]; ok {
 		if intval, err := strconv.ParseUint(val, 10, 64); err == nil {