diff options
| author | Jiong Du <londevil@gmail.com> | 2014-12-30 16:12:50 +0800 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2015-04-07 09:27:26 +0000 |
| commit | cce127a75f72110c045319407a652829b5a5b716 (patch) | |
| tree | bf7d51712bdcbf40e656593cd07ea547b2f6808a /src/database/sql/sql.go | |
| parent | b40421f32c37064f5eb9b00f4f5aebe7243be6cd (diff) | |
| download | go-cce127a75f72110c045319407a652829b5a5b716.tar.xz | |
database/sql: close connection if db.numOpen > db.maxOpen
Bug Description:
When reduce db.maxOpen via db.SetMaxOpenConns, the unnecssary
connections won't been released until all other connections are free.
Fixes #9453
Change-Id: I9afb2e4b184139b31029ae53d7f5fd1fdb8d8d7e
Reviewed-on: https://go-review.googlesource.com/2200
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/database/sql/sql.go')
| -rw-r--r-- | src/database/sql/sql.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go index b0e8894673..0a84163a03 100644 --- a/src/database/sql/sql.go +++ b/src/database/sql/sql.go @@ -782,6 +782,9 @@ func (db *DB) putConn(dc *driverConn, err error) { // If a connRequest was fulfilled or the *driverConn was placed in the // freeConn list, then true is returned, otherwise false is returned. func (db *DB) putConnDBLocked(dc *driverConn, err error) bool { + if db.maxOpen > 0 && db.numOpen > db.maxOpen { + return false + } if c := len(db.connRequests); c > 0 { req := db.connRequests[0] // This copy is O(n) but in practice faster than a linked list. |