redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-04-17 20:17:02 +03:00
Code

Fix wrong usage of timer Reset(), which could cause service frozen during master switch.

Browse Source
This commit is contained in:
yuekui 2017-03-03 15:45:40 -08:00 committed by Vladimir Mihailenco
parent 7849e1fac4
commit 216ec11a0e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/pool/pool.go
View File

@ -19,7 +19,9 @@ var (
var timers = sync.Pool{
New: func() interface{} {
return time.NewTimer(0)
t := time.NewTimer(time.Hour)
t.Stop()
return t
},
}
@ -95,12 +97,13 @@ func (p *ConnPool) NewConn() (*Conn, error) {
func (p *ConnPool) PopFree() *Conn {
timer := timers.Get().(*time.Timer)
if !timer.Reset(p.poolTimeout) {
<-timer.C
}
timer.Reset(p.poolTimeout)
select {
case p.queue <- struct{}{}:
if !timer.Stop() {
<-timer.C
}
timers.Put(timer)
case <-timer.C:
timers.Put(timer)
@ -138,12 +141,13 @@ func (p *ConnPool) Get() (*Conn, bool, error) {
atomic.AddUint32(&p.stats.Requests, 1)
timer := timers.Get().(*time.Timer)
if !timer.Reset(p.poolTimeout) {
<-timer.C
}
timer.Reset(p.poolTimeout)
select {
case p.queue <- struct{}{}:
if !timer.Stop() {
<-timer.C
}
timers.Put(timer)
case <-timer.C:
timers.Put(timer)