storage/sql/postgres: expose stdlib tunables, set them for tests
- adapted TestUnmarshalConfig to ensure the fields are read in - added a test to see that at least MaxOpenConns works: - this is only exposed through (*db).Stats() in go 1.11, so this test has a build tag - the other two configurables can't be read back, so we've got to trust that the mechanism works given the one instance that's tested.. Signed-off-by: Stephan Renatus <srenatus@chef.io>
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/lib/pq"
|
||||
sqlite3 "github.com/mattn/go-sqlite3"
|
||||
@@ -88,6 +89,13 @@ type Postgres struct {
|
||||
SSL PostgresSSL `json:"ssl" yaml:"ssl"`
|
||||
|
||||
ConnectionTimeout int // Seconds
|
||||
|
||||
// database/sql tunables, see
|
||||
// https://golang.org/pkg/database/sql/#DB.SetConnMaxLifetime and below
|
||||
// Note: defaults will be set if these are 0
|
||||
MaxOpenConns int // default: 5
|
||||
MaxIdleConns int // default: 5
|
||||
ConnMaxLifetime int // Seconds, default: not set
|
||||
}
|
||||
|
||||
// Open creates a new storage implementation backed by Postgres.
|
||||
@@ -177,6 +185,23 @@ func (p *Postgres) open(logger logrus.FieldLogger, dataSourceName string) (*conn
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// set database/sql tunables if configured
|
||||
if p.ConnMaxLifetime != 0 {
|
||||
db.SetConnMaxLifetime(time.Duration(p.ConnMaxLifetime) * time.Second)
|
||||
}
|
||||
|
||||
if p.MaxIdleConns == 0 {
|
||||
db.SetMaxIdleConns(5)
|
||||
} else {
|
||||
db.SetMaxIdleConns(p.MaxIdleConns)
|
||||
}
|
||||
|
||||
if p.MaxOpenConns == 0 {
|
||||
db.SetMaxOpenConns(5)
|
||||
} else {
|
||||
db.SetMaxOpenConns(p.MaxOpenConns)
|
||||
}
|
||||
|
||||
errCheck := func(err error) bool {
|
||||
sqlErr, ok := err.(*pq.Error)
|
||||
if !ok {
|
||||
|
Reference in New Issue
Block a user