Bump Redis client version to v8.11.4

[ric-plt/sdlgo.git] / internal / sdlgoredis / sdlgosentinel.go

diff --git a/internal/sdlgoredis/sdlgosentinel.go b/internal/sdlgoredis/sdlgosentinel.go
index f439570..8a1b331 100644 (file)
--- a/internal/sdlgoredis/sdlgosentinel.go
+++ b/internal/sdlgoredis/sdlgosentinel.go
@@ -23,18 +23,22 @@
 package sdlgoredis
 
 import (
-       "github.com/go-redis/redis/v7"
+       "context"
+       "fmt"
+       "github.com/go-redis/redis/v8"
+       "strconv"
 )
 
 type Sentinel struct {
+       ctx context.Context
        IredisSentinelClient
        Cfg *Config
 }
 
 type IredisSentinelClient interface {
-       Master(name string) *redis.StringStringMapCmd
-       Slaves(name string) *redis.SliceCmd
-       Sentinels(name string) *redis.SliceCmd
+       Master(ctx context.Context, name string) *redis.StringStringMapCmd
+       Slaves(ctx context.Context, name string) *redis.SliceCmd
+       Sentinels(ctx context.Context, name string) *redis.SliceCmd
 }
 
 type RedisSentinelCreateCb func(cfg *Config, addr string) *Sentinel
@@ -42,6 +46,7 @@ type RedisSentinelCreateCb func(cfg *Config, addr string) *Sentinel
 func newRedisSentinel(cfg *Config, addr string) *Sentinel {
        redisAddress := addr + ":" + cfg.sentinelPort
        return &Sentinel{
+               ctx: context.Background(),
                IredisSentinelClient: redis.NewSentinelClient(&redis.Options{
                        Addr:       redisAddress,
                        Password:   "", // no password set
@@ -61,6 +66,14 @@ func (s *Sentinel) GetDbState() (*DbState, error) {
        state.PrimaryDbState = *pState
        state.ReplicasDbState = rState
        state.SentinelsDbState = sState
+
+       cnt, err := strconv.Atoi(s.Cfg.nodeCnt)
+       if err != nil {
+               state.Err = fmt.Errorf("Sentinel DBAAS_NODE_COUNT configuration value '%s' conversion to integer failed", s.Cfg.nodeCnt)
+               return state, state.Err
+       }
+       state.ConfigNodeCnt = cnt
+
        if pErr != nil {
                return state, pErr
        }
@@ -72,7 +85,7 @@ func (s *Sentinel) GetDbState() (*DbState, error) {
 
 func (s *Sentinel) getPrimaryDbState() (*PrimaryDbState, error) {
        state := new(PrimaryDbState)
-       redisVal, redisErr := s.Master(s.Cfg.masterName).Result()
+       redisVal, redisErr := s.Master(s.ctx, s.Cfg.masterName).Result()
        if redisErr == nil {
                state.Fields.Ip = redisVal["ip"]
                state.Fields.Port = redisVal["port"]
@@ -87,7 +100,7 @@ func (s *Sentinel) getReplicasState() (*ReplicasDbState, error) {
        states := new(ReplicasDbState)
        states.States = make([]*ReplicaDbState, 0)
 
-       redisVal, redisErr := s.Slaves(s.Cfg.masterName).Result()
+       redisVal, redisErr := s.Slaves(s.ctx, s.Cfg.masterName).Result()
        if redisErr == nil {
                for _, redisReplica := range redisVal {
                        replicaState := readReplicaState(redisReplica.([]interface{}))
@@ -120,11 +133,15 @@ func (s *Sentinel) getSentinelsState() (*SentinelsDbState, error) {
        states := new(SentinelsDbState)
        states.States = make([]*SentinelDbState, 0)
 
-       redisVal, redisErr := s.Sentinels(s.Cfg.masterName).Result()
+       redisVal, redisErr := s.Sentinels(s.ctx, s.Cfg.masterName).Result()
        if redisErr == nil {
                for _, redisSentinel := range redisVal {
                        sentinelState := readSentinelState(redisSentinel.([]interface{}))
-                       states.States = append(states.States, sentinelState)
+                       // Ignore a sentinel entry with zero port, because missing of fix
+                       // for the Redis Bug #9240.
+                       if sentinelState.Fields.Port != "0" {
+                               states.States = append(states.States, sentinelState)
+                       }
                }
        }
        states.Err = redisErr