Skip to content

Commit 8d9ebc8

Browse files
committed
Shuffle sentinel addrs once
1 parent 8b19c31 commit 8d9ebc8

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

sentinel.go

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@ func NewFailoverClient(failoverOpt *FailoverOptions) *Client {
173173
sentinelAddrs := make([]string, len(failoverOpt.SentinelAddrs))
174174
copy(sentinelAddrs, failoverOpt.SentinelAddrs)
175175

176+
rand.Shuffle(len(sentinelAddrs), func(i, j int) {
177+
sentinelAddrs[i], sentinelAddrs[j] = sentinelAddrs[j], sentinelAddrs[i]
178+
})
179+
176180
failover := &sentinelFailover{
177181
opt: failoverOpt,
178182
sentinelAddrs: sentinelAddrs,
@@ -484,11 +488,6 @@ func (c *sentinelFailover) MasterAddr(ctx context.Context) (string, error) {
484488
_ = c.closeSentinel()
485489
}
486490

487-
if c.opt.QuerySentinelRandomly {
488-
rand.Shuffle(len(c.sentinelAddrs), func(i, j int) {
489-
c.sentinelAddrs[i], c.sentinelAddrs[j] = c.sentinelAddrs[j], c.sentinelAddrs[i]
490-
})
491-
}
492491
for i, sentinelAddr := range c.sentinelAddrs {
493492
sentinel := NewSentinelClient(c.opt.sentinelOptions(sentinelAddr))
494493

@@ -533,11 +532,6 @@ func (c *sentinelFailover) slaveAddrs(ctx context.Context, useDisconnected bool)
533532
}
534533
_ = c.closeSentinel()
535534
}
536-
if c.opt.QuerySentinelRandomly {
537-
rand.Shuffle(len(c.sentinelAddrs), func(i, j int) {
538-
c.sentinelAddrs[i], c.sentinelAddrs[j] = c.sentinelAddrs[j], c.sentinelAddrs[i]
539-
})
540-
}
541535

542536
var sentinelReachable bool
543537

0 commit comments

Comments
 (0)