feature: ignore slave whose slave-priority = 0

Author: polefishu

pkg/apis/redis/v1beta1/validate.go

@@ -14,6 +14,8 @@ const (
 	defaultRedisNumber    = 3
 	defaultSentinelNumber = 3
 	defaultRedisImage     = "redis:5.0.4-alpine"
+
+	defaultSlavePriority = "1"
 )
 
 var (
@@ -29,7 +31,7 @@ func (r *RedisCluster) Validate() error {
 	if r.Spec.Size == 0 {
 		r.Spec.Size = defaultRedisNumber
 	} else if r.Spec.Size < defaultRedisNumber {
-		return errors.New("number of redises in spec is less than the minimum")
+		return errors.New("number of redis in spec is less than the minimum")
 	}
 
 	if r.Spec.Sentinel.Replicas == 0 {
@@ -54,6 +56,9 @@ func (r *RedisCluster) Validate() error {
 		r.Spec.Config = make(map[string]string)
 	}
 
+	// https://github.com/ucloud/redis-operator/issues/6
+	r.Spec.Config["slave-priority"] = defaultSlavePriority
+
 	if !r.Spec.DisablePersistence {
 		enablePersistence(r.Spec.Config)
 	} else {

pkg/client/redis/client.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"reflect"
 	"regexp"
 	"strconv"
 	"strings"
@@ -92,17 +93,25 @@ func (c *client) GetNumberSentinelSlavesInMemory(ip string, auth *util.AuthConfi
 		return 0, err
 	}
 
-	if err2 := isSentinelReady(info); err2 != nil {
-		return 0, err2
-	}
-	match := slaveNumberRE.FindStringSubmatch(info)
-	if len(match) == 0 {
-		return 0, errors.New("slaves regex not found")
+	if err = isSentinelReady(info); err != nil {
+		return 0, err
 	}
-	nSlaves, err := strconv.Atoi(match[1])
+
+	cmd := rediscli.NewSliceCmd("sentinel", "slaves", masterName)
+	rClient.Process(cmd)
+	slaveInfoBlobs, err := cmd.Result()
 	if err != nil {
 		return 0, err
 	}
+	nSlaves := len(slaveInfoBlobs)
+	for _, slaveInfoBlob := range slaveInfoBlobs {
+		slaveInfo := reflect.ValueOf(slaveInfoBlob)
+		slavePriority := fmt.Sprintf("%+v", slaveInfo.Index(37))
+		if slavePriority == "0" {
+			nSlaves -= 1
+		}
+	}
+
 	return int32(nSlaves), nil
 }