mirror
/
redis
mirror of https://github.com/go-redis/redis.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #654 from go-redis/fix/pool-panic 

Fix pool panics
This commit is contained in:
Vladimir Mihailenco 2017-10-12 11:56:05 +03:00 committed by GitHub
parent 9c20773cb2 dac1820e47
commit 35248155a5
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
internal/pool/pool.go
View File

@ -60,8 +60,10 @@ type Options struct {
type ConnPool struct { type ConnPool struct {
opt *Options opt *Options
dialErrorsNum uint32 // atomic dialErrorsNum uint32 // atomic
_lastDialError atomic.Value
lastDialError error
lastDialErrorMu sync.RWMutex
queue chan struct{} queue chan struct{}
@ -98,7 +100,7 @@ func (p *ConnPool) NewConn() (*Conn, error) {
} }
if atomic.LoadUint32(&p.dialErrorsNum) >= uint32(p.opt.PoolSize) { if atomic.LoadUint32(&p.dialErrorsNum) >= uint32(p.opt.PoolSize) {
return nil, p.lastDialError() return nil, p.getLastDialError()
} }
netConn, err := p.opt.Dialer() netConn, err := p.opt.Dialer()
@ -138,11 +140,16 @@ func (p *ConnPool) tryDial() {
} }
func (p *ConnPool) setLastDialError(err error) { func (p *ConnPool) setLastDialError(err error) {
p._lastDialError.Store(err) p.lastDialErrorMu.Lock()
p.lastDialError = err
p.lastDialErrorMu.Unlock()
} }
func (p *ConnPool) lastDialError() error { func (p *ConnPool) getLastDialError() error {
return p._lastDialError.Load().(error) p.lastDialErrorMu.RLock()
err := p.lastDialError
p.lastDialErrorMu.RUnlock()
return err
} }
// Get returns existed connection from the pool or creates a new one. // Get returns existed connection from the pool or creates a new one.