Fix race in checkMinIdleConns

vmihailenco · vmihailenco · commit 0f388adcd3d1 · 2020-05-31T13:32:36.000+03:00
diff --git a/doc.go b/doc.go
@@ -1,4 +1,4 @@
 /*
-Package pg implements a PostgreSQL client.
+pg provides PostgreSQL client.
 */
 package pg
diff --git a/internal/internal.go b/internal/internal.go
@@ -1,3 +1,6 @@
+/*
+internal is a private internal package.
+*/
 package internal
 
 import (
diff --git a/internal/pool/pool.go b/internal/pool/pool.go
@@ -93,7 +93,9 @@ func NewConnPool(opt *Options) *ConnPool {
 		idleConns: make([]*Conn, 0, opt.PoolSize),
 	}
 
+	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
`@@ -93,7 +93,9 @@ func NewConnPool(opt Options) ConnPool {`
`93`	`93`	`idleConns: make([]*Conn, 0, opt.PoolSize),`
`94`	`94`	`}`
`95`	`95`
	`96`	`+ p.connsMu.Lock()`
`96`	`97`	`p.checkMinIdleConns()`
	`98`	`+ p.connsMu.Unlock()`
`97`	`99`
`98`	`100`	`if opt.IdleTimeout > 0 && opt.IdleCheckFrequency > 0 {`
`99`	`101`	`go p.reaper(opt.IdleCheckFrequency)`