Merge pull request #1073 from go-redis/fix/failover-dialer-when-available

vmihailenco · web-flow · commit 79e9e3ff94f5 · 2019-06-29T12:53:26.000+03:00
Use Dialer in Sentinel failover when available
diff --git a/sentinel.go b/sentinel.go
@@ -306,8 +306,9 @@ func (c *sentinelFailover) Close() error {
 
 func (c *sentinelFailover) Pool() *pool.ConnPool {
 	c.poolOnce.Do(func() {
-		c.opt.Dialer = c.dial
-		c.pool = newConnPool(c.opt)
+		opt := *c.opt
+		opt.Dialer = c.dial
+		c.pool = newConnPool(&opt)
 	})
 	return c.pool
 }
@@ -317,6 +318,9 @@ func (c *sentinelFailover) dial(ctx context.Context, network, addr string) (net.
 	if err != nil {
 		return nil, err
 	}
+	if c.opt.Dialer != nil {
+		return c.opt.Dialer(ctx, network, addr)
+	}
 	return net.DialTimeout("tcp", addr, c.opt.DialTimeout)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -306,8 +306,9 @@ func (c *sentinelFailover) Close() error {`
`306`	`306`
`307`	`307`	`func (c sentinelFailover) Pool() pool.ConnPool {`
`308`	`308`	`c.poolOnce.Do(func() {`
`309`		`- c.opt.Dialer = c.dial`
`310`		`- c.pool = newConnPool(c.opt)`
	`309`	`+ opt := *c.opt`
	`310`	`+ opt.Dialer = c.dial`
	`311`	`+ c.pool = newConnPool(&opt)`
`311`	`312`	`})`
`312`	`313`	`return c.pool`
`313`	`314`	`}`
`@@ -317,6 +318,9 @@ func (c *sentinelFailover) dial(ctx context.Context, network, addr string) (net.`
`317`	`318`	`if err != nil {`
`318`	`319`	`return nil, err`
`319`	`320`	`}`
	`321`	`+ if c.opt.Dialer != nil {`
	`322`	`+ return c.opt.Dialer(ctx, network, addr)`
	`323`	`+ }`
`320`	`324`	`return net.DialTimeout("tcp", addr, c.opt.DialTimeout)`
`321`	`325`	`}`
`322`	`326`