fix ConnPool race in newConn

os-oc · os-oc · commit b3d195467d1c · 2024-02-05T17:55:52.000+04:00
diff --git a/internal/pool/pool.go b/internal/pool/pool.go
@@ -168,9 +168,12 @@ func (p *ConnPool) newConn(ctx context.Context, pooled bool) (*Conn, error) {
 		return nil, ErrClosed
 	}
 
+	p.connsMu.Lock()
 	if p.cfg.MaxActiveConns > 0 && p.poolSize >= p.cfg.MaxActiveConns {
+		p.connsMu.Unlock()
 		return nil, ErrPoolExhausted
 	}
+	p.connsMu.Unlock()
 
 	cn, err := p.dialConn(ctx, pooled)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -168,9 +168,12 @@ func (p ConnPool) newConn(ctx context.Context, pooled bool) (Conn, error) {`
`168`	`168`	`return nil, ErrClosed`
`169`	`169`	`}`
`170`	`170`
	`171`	`+ p.connsMu.Lock()`
`171`	`172`	`if p.cfg.MaxActiveConns > 0 && p.poolSize >= p.cfg.MaxActiveConns {`
	`173`	`+ p.connsMu.Unlock()`
`172`	`174`	`return nil, ErrPoolExhausted`
`173`	`175`	`}`
	`176`	`+ p.connsMu.Unlock()`
`174`	`177`
`175`	`178`	`cn, err := p.dialConn(ctx, pooled)`
`176`	`179`	`if err != nil {`