Commit 4bea2da

committed

feature: ignore slave whose slave-priority = 0

1 parent f4cf6ef commit 4bea2daCopy full SHA for 4bea2da

File tree

+22

-8

lines changed

+22

-8

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ const (`
`14`	`14`	`defaultRedisNumber = 3`
`15`	`15`	`defaultSentinelNumber = 3`
`16`	`16`	`defaultRedisImage = "redis:5.0.4-alpine"`
	`17`	`+`
	`18`	`+ defaultSlavePriority = "1"`
`17`	`19`	`)`
`18`	`20`
`19`	`21`	`var (`
`@@ -29,7 +31,7 @@ func (r *RedisCluster) Validate() error {`
`29`	`31`	`if r.Spec.Size == 0 {`
`30`	`32`	`r.Spec.Size = defaultRedisNumber`
`31`	`33`	`} else if r.Spec.Size < defaultRedisNumber {`
`32`		`- return errors.New("number of redises in spec is less than the minimum")`
	`34`	`+ return errors.New("number of redis in spec is less than the minimum")`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`if r.Spec.Sentinel.Replicas == 0 {`
`@@ -54,6 +56,9 @@ func (r *RedisCluster) Validate() error {`
`54`	`56`	`r.Spec.Config = make(map[string]string)`
`55`	`57`	`}`
`56`	`58`
	`59`	`+ // https://github.com/ucloud/redis-operator/issues/6`
	`60`	`+ r.Spec.Config["slave-priority"] = defaultSlavePriority`
	`61`	`+`
`57`	`62`	`if !r.Spec.DisablePersistence {`
`58`	`63`	`enablePersistence(r.Spec.Config)`
`59`	`64`	`} else {`

Lines changed: 16 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"errors"`
`5`	`5`	`"fmt"`
`6`	`6`	`"net"`
	`7`	`+ "reflect"`
`7`	`8`	`"regexp"`
`8`	`9`	`"strconv"`
`9`	`10`	`"strings"`
`@@ -92,17 +93,25 @@ func (c client) GetNumberSentinelSlavesInMemory(ip string, auth util.AuthConfi`
`92`	`93`	`return 0, err`
`93`	`94`	`}`
`94`	`95`
`95`		`- if err2 := isSentinelReady(info); err2 != nil {`
`96`		`- return 0, err2`
`97`		`- }`
`98`		`- match := slaveNumberRE.FindStringSubmatch(info)`
`99`		`- if len(match) == 0 {`
`100`		`- return 0, errors.New("slaves regex not found")`
	`96`	`+ if err = isSentinelReady(info); err != nil {`
	`97`	`+ return 0, err`
`101`	`98`	`}`
`102`		`- nSlaves, err := strconv.Atoi(match[1])`
	`99`	`+`
	`100`	`+ cmd := rediscli.NewSliceCmd("sentinel", "slaves", masterName)`
	`101`	`+ rClient.Process(cmd)`
	`102`	`+ slaveInfoBlobs, err := cmd.Result()`
`103`	`103`	`if err != nil {`
`104`	`104`	`return 0, err`
`105`	`105`	`}`
	`106`	`+ nSlaves := len(slaveInfoBlobs)`
	`107`	`+ for _, slaveInfoBlob := range slaveInfoBlobs {`
	`108`	`+ slaveInfo := reflect.ValueOf(slaveInfoBlob)`
	`109`	`+ slavePriority := fmt.Sprintf("%+v", slaveInfo.Index(37))`
	`110`	`+ if slavePriority == "0" {`
	`111`	`+ nSlaves -= 1`
	`112`	`+ }`
	`113`	`+ }`
	`114`	`+`
`106`	`115`	`return int32(nSlaves), nil`
`107`	`116`	`}`
`108`	`117`

Comments

(0)