qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-25 16:47:56 -07:00
Code Releases Activity

database/sql: wake cleaner when maxIdleTime less than maxLifetime

Browse Source 
The existing implementation wouldn't wake the connection cleaner if
maxIdleTime was set to a value less than maxLifetime
resulting in idle connections being held
on to longer than expected.

Fixes #45993
This commit is contained in:
Philip Roberts 2023-02-13 13:45:00 +00:00
parent 71c84d4b41
commit 0d149d8d38
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/database/sql/sql.go
View File

@ -1007,7 +1007,7 @@ func (db *DB) SetConnMaxLifetime(d time.Duration) {
} }
db.mu.Lock() db.mu.Lock()
// Wake cleaner up when lifetime is shortened. // Wake cleaner up when lifetime is shortened.
if d > 0 && d < db.maxLifetime && db.cleanerCh != nil { if d > 0 && d < db.shortestIdleTimeLocked() && db.cleanerCh != nil {
select { select {
case db.cleanerCh <- struct{}{}: case db.cleanerCh <- struct{}{}:
default: default:
@ -1031,7 +1031,7 @@ func (db *DB) SetConnMaxIdleTime(d time.Duration) {
defer db.mu.Unlock() defer db.mu.Unlock()
// Wake cleaner up when idle time is shortened. // Wake cleaner up when idle time is shortened.
if d > 0 && d < db.maxIdleTime && db.cleanerCh != nil { if d > 0 && d < db.shortestIdleTimeLocked() && db.cleanerCh != nil {
select { select {
case db.cleanerCh <- struct{}{}: case db.cleanerCh <- struct{}{}:
default: default: