fix: redis get role overtime (#8691)

apecloud · Dec 25, 2024 · bd1a859 · bd1a859
1 parent 31ff93a
commit bd1a859
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/pkg/lorry/engines/redis/get_replica_role.go b/pkg/lorry/engines/redis/get_replica_role.go
@@ -34,10 +34,8 @@ func (mgr *Manager) GetReplicaRole(ctx context.Context, _ *dcs.Cluster) (string,
 		return mgr.role, nil
 	}
 
-	// We use the role obtained from Sentinel as the sole source of truth.
-	masterAddr, err := mgr.sentinelClient.GetMasterAddrByName(ctx, mgr.ClusterCompName).Result()
-	if err != nil {
-		// when we can't get role from sentinel, we query redis instead
+	// when we can't get role from sentinel, we query redis instead
+	getRoleFromRedisClient := func() (string, error) {
 		var role string
 		result, err := mgr.client.Info(ctx, "Replication").Result()
 		if err != nil {
@@ -61,6 +59,16 @@ func (mgr *Manager) GetReplicaRole(ctx context.Context, _ *dcs.Cluster) (string,
 		}
 	}
 
+	if mgr.sentinelClient == nil {
+		return getRoleFromRedisClient()
+	}
+
+	// We use the role obtained from Sentinel as the sole source of truth.
+	masterAddr, err := mgr.sentinelClient.GetMasterAddrByName(ctx, mgr.ClusterCompName).Result()
+	if err != nil {
+		return getRoleFromRedisClient()
+	}
+
 	masterName := strings.Split(masterAddr[0], ".")[0]
 	// if current member is not master from sentinel, just return secondary to avoid double master
 	if masterName != mgr.CurrentMemberName {

diff --git a/pkg/lorry/engines/redis/manager.go b/pkg/lorry/engines/redis/manager.go
@@ -44,8 +44,6 @@ type Manager struct {
 	clientSettings *Settings
 	sentinelClient *redis.SentinelClient
 
-	ctx                     context.Context
-	cancel                  context.CancelFunc
 	startAt                 time.Time
 	role                    string
 	roleSubscribeUpdateTime int64
@@ -90,10 +88,10 @@ func NewManager(properties engines.Properties) (engines.DBManager, error) {
 	}
 
 	mgr.sentinelClient = newSentinelClient(mgr.clientSettings, mgr.ClusterCompName)
+	if mgr.sentinelClient != nil {
+		go mgr.SubscribeRoleChange(context.Background())
+	}
 
-	mgr.ctx, mgr.cancel = context.WithCancel(context.Background())
-
-	go mgr.SubscribeRoleChange(mgr.ctx)
 	return mgr, nil
 }
 

diff --git a/pkg/lorry/engines/redis/redis.go b/pkg/lorry/engines/redis/redis.go
@@ -145,7 +145,15 @@ func newClient(s *Settings) redis.UniversalClient {
 }
 
 func newSentinelClient(s *Settings, clusterCompName string) *redis.SentinelClient {
+	if !viper.IsSet("SENTINEL_COMPONENT_NAME") {
+		// cluster has no sentinel
+		return nil
+	}
+
 	sentinelHost := fmt.Sprintf("%s-sentinel-headless", clusterCompName)
+	if viper.IsSet("SENTINEL_HEADLESS_SERVICE_NAME") {
+		sentinelHost = viper.GetString("SENTINEL_HEADLESS_SERVICE_NAME")
+	}
 	sentinelPort := "26379"
 	if viper.IsSet("REDIS_SENTINEL_HOST_NETWORK_PORT") {
 		sentinelPort = viper.GetString("REDIS_SENTINEL_HOST_NETWORK_PORT")