Ring: remove redundant 'LEAVING' status in Operation construction (#4485)

amoylan2 · web-flow · commit 1d29897a109a · 2021-10-01T12:01:05.000+01:00
Signed-off-by: lanmengran1 &lt;lanmengran1@jd.com&gt;
diff --git a/pkg/ring/ring.go b/pkg/ring/ring.go
@@ -866,7 +866,7 @@ func NewOp(healthyStates []InstanceState, shouldExtendReplicaSet func(s Instance
 	}
 
 	if shouldExtendReplicaSet != nil {
-		for _, s := range []InstanceState{ACTIVE, LEAVING, PENDING, JOINING, LEAVING, LEFT} {
+		for _, s := range []InstanceState{ACTIVE, LEAVING, PENDING, JOINING, LEFT} {
 			if shouldExtendReplicaSet(s) {
 				op |= (0x10000 << s)
 			}

Original file line number	Diff line number	Diff line change
`@@ -866,7 +866,7 @@ func NewOp(healthyStates []InstanceState, shouldExtendReplicaSet func(s Instance`
`866`	`866`	`}`
`867`	`867`
`868`	`868`	`if shouldExtendReplicaSet != nil {`
`869`		`- for _, s := range []InstanceState{ACTIVE, LEAVING, PENDING, JOINING, LEAVING, LEFT} {`
	`869`	`+ for _, s := range []InstanceState{ACTIVE, LEAVING, PENDING, JOINING, LEFT} {`
`870`	`870`	`if shouldExtendReplicaSet(s) {`
`871`	`871`	`op \|= (0x10000 << s)`
`872`	`872`	`}`