Merge pull request #1315 from lwightmoon/master

vmihailenco · web-flow · commit 64bb0b7f3af4 · 2020-05-19T08:52:02.000+03:00
fix NewConnPool checkMinIdleConns data race
diff --git a/internal/pool/pool.go b/internal/pool/pool.go
@@ -94,7 +94,9 @@ func NewConnPool(opt *Options) *ConnPool {
 		closedCh:  make(chan struct{}),
 	}
 
+	p.connsMu.Lock()
 	p.checkMinIdleConns()
+	p.connsMu.Unlock()
 
 	if opt.IdleTimeout > 0 && opt.IdleCheckFrequency > 0 {
 		go p.reaper(opt.IdleCheckFrequency)

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,9 @@ func NewConnPool(opt Options) ConnPool {`
`94`	`94`	`closedCh: make(chan struct{}),`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ p.connsMu.Lock()`
`97`	`98`	`p.checkMinIdleConns()`
	`99`	`+ p.connsMu.Unlock()`
`98`	`100`
`99`	`101`	`if opt.IdleTimeout > 0 && opt.IdleCheckFrequency > 0 {`
`100`	`102`	`go p.reaper(opt.IdleCheckFrequency)`