chore: Add ability to configure maximum DB connection lifetime (#3032)

argoproj · May 15, 2020 · b7ff9f0 · b7ff9f0
1 parent 38a995b
commit b7ff9f0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 2 deletions.
diff --git a/config/config.go b/config/config.go
@@ -141,8 +141,9 @@ func (c PersistConfig) GetClusterName() string {
 }
 
 type ConnectionPool struct {
- MaxIdleConns int `json:"maxIdleConns,omitempty"`
- MaxOpenConns int `json:"maxOpenConns,omitempty"`
+ MaxIdleConns int `json:"maxIdleConns,omitempty"`
+ MaxOpenConns int `json:"maxOpenConns,omitempty"`
+ ConnMaxLifetime TTL `json:"connMaxLifetime,omitempty"`
 }
 type PostgreSQLConfig struct {
  Host string `json:"host"`

diff --git a/docs/workflow-controller-configmap.yaml b/docs/workflow-controller-configmap.yaml
@@ -146,6 +146,7 @@ data:
  connectionPool:
  maxIdleConns: 100
  maxOpenConns: 0
+ connMaxLifetime: 0s # 0 means connections don't have a max lifetime
  # if true node status is only saved to the persistence DB to avoid the 1MB limit in etcd
  nodeStatusOffLoad: false
  # save completed workloads to the workflow archive

diff --git a/manifests/quick-start-mysql.yaml b/manifests/quick-start-mysql.yaml
@@ -369,6 +369,7 @@ data:
  connectionPool:
  maxIdleConns: 100
  maxOpenConns: 0
+ connMaxLifetime: 0s
  nodeStatusOffLoad: true
  archive: true
  archiveTTL: 7d

diff --git a/manifests/quick-start-postgres.yaml b/manifests/quick-start-postgres.yaml
@@ -369,6 +369,7 @@ data:
  connectionPool:
  maxIdleConns: 100
  maxOpenConns: 0
+ connMaxLifetime: 0s
  nodeStatusOffLoad: true
  archive: true
  archiveTTL: 7d

diff --git a/manifests/quick-start/mysql/overlays/workflow-controller-configmap.yaml b/manifests/quick-start/mysql/overlays/workflow-controller-configmap.yaml
@@ -4,6 +4,7 @@ data:
  connectionPool:
  maxIdleConns: 100
  maxOpenConns: 0
+ connMaxLifetime: 0s
  nodeStatusOffLoad: true
  archive: true
  archiveTTL: 7d

diff --git a/manifests/quick-start/postgres/overlays/workflow-controller-configmap.yaml b/manifests/quick-start/postgres/overlays/workflow-controller-configmap.yaml
@@ -4,6 +4,7 @@ data:
  connectionPool:
  maxIdleConns: 100
  maxOpenConns: 0
+ connMaxLifetime: 0s
  nodeStatusOffLoad: true
  archive: true
  archiveTTL: 7d

diff --git a/persist/sqldb/sqldb.go b/persist/sqldb/sqldb.go
@@ -2,6 +2,7 @@ package sqldb
 
 import (
  "fmt"
+ "time"
 
  log "github.com/sirupsen/logrus"
  "k8s.io/client-go/kubernetes"
@@ -70,6 +71,7 @@ func CreatePostGresDBSession(kubectlConfig kubernetes.Interface, namespace strin
  if persistPool != nil {
  session.SetMaxOpenConns(persistPool.MaxOpenConns)
  session.SetMaxIdleConns(persistPool.MaxIdleConns)
+ session.SetConnMaxLifetime(time.Duration(persistPool.ConnMaxLifetime))
  }
  return session, cfg.TableName, nil
 }
@@ -103,6 +105,7 @@ func CreateMySQLDBSession(kubectlConfig kubernetes.Interface, namespace string,
  if persistPool != nil {
  session.SetMaxOpenConns(persistPool.MaxOpenConns)
  session.SetMaxIdleConns(persistPool.MaxIdleConns)
+ session.SetConnMaxLifetime(time.Duration(persistPool.ConnMaxLifetime))
  }
  // this is needed to make MySQL run in a Golang-compatible UTF-8 character set.
  _, err = session.Exec("SET NAMES 'utf8mb4'")