public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-08 12:21:49 +02:00
Code Issues Projects Releases Wiki Activity

Bugfix/close db connections (#78)

Browse Source 
Open and close DB connections on-demand.

Previously, we used to leave the DB connection open while the
cluster was registered with the operator, potentially resutling
in dangled connections if the operator terminates abnormally.

Small refactoring around the role syncing code.
This commit is contained in:
Oleksii Kliukin
2017-08-10 10:10:00 +02:00
committed by GitHub
parent 8b58782a4a
commit f15f93f479
4 changed files with 45 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/sync.go
+30 -27
View File
@@ -3,6 +3,7 @@ package cluster
import (
"fmt"
"github.com/zalando-incubator/postgres-operator/pkg/spec"
"github.com/zalando-incubator/postgres-operator/pkg/util"
"github.com/zalando-incubator/postgres-operator/pkg/util/k8sutil"
"github.com/zalando-incubator/postgres-operator/pkg/util/volumes"
@@ -19,8 +20,14 @@ func (c *Cluster) Sync() error {
c.logger.Errorf("could not load resources: %v", err)
}
if err = c.initUsers(); err != nil {
return err
}
c.logger.Debugf("Syncing secrets")
if err := c.syncSecrets(); err != nil {
//TODO: mind the secrets of the deleted/new users
if err := c.applySecrets(); err != nil {
if !k8sutil.ResourceAlreadyExists(err) {
return fmt.Errorf("could not sync secrets: %v", err)
}
@@ -59,11 +66,8 @@ func (c *Cluster) Sync() error {
}
if !c.databaseAccessDisabled() {
if err := c.initDbConn(); err != nil {
return fmt.Errorf("could not init db connection: %v", err)
}
c.logger.Debugf("Syncing roles")
if err := c.syncRoles(); err != nil {
if err := c.syncRoles(true); err != nil {
return fmt.Errorf("could not sync roles: %v", err)
}
}
@@ -76,17 +80,6 @@ func (c *Cluster) Sync() error {
return nil
}
func (c *Cluster) syncSecrets() error {
//TODO: mind the secrets of the deleted/new users
if err := c.initUsers(); err != nil {
return err
}
err := c.applySecrets()
return err
}
func (c *Cluster) syncService(role postgresRole) error {
cSpec := c.Spec
if c.Service[role] == nil {
@@ -193,21 +186,31 @@ func (c *Cluster) syncStatefulSet() error {
return nil
}
func (c *Cluster) syncRoles() error {
var userNames []string
func (c *Cluster) syncRoles(readFromDatabase bool) error {
var (
err error
dbUsers spec.PgUserMap
userNames []string
)
if err := c.initUsers(); err != nil {
return err
}
for _, u := range c.pgUsers {
userNames = append(userNames, u.Name)
}
dbUsers, err := c.readPgUsersFromDatabase(userNames)
err = c.initDbConn()
if err != nil {
return fmt.Errorf("error getting users from the database: %v", err)
return fmt.Errorf("could not init db connection: %v", err)
}
defer c.closeDbConn()
if readFromDatabase {
for _, u := range c.pgUsers {
userNames = append(userNames, u.Name)
}
dbUsers, err = c.readPgUsersFromDatabase(userNames)
if err != nil {
return fmt.Errorf("error getting users from the database: %v", err)
}
}
pgSyncRequests := c.userSyncStrategy.ProduceSyncRequests(dbUsers, c.pgUsers)
if err := c.userSyncStrategy.ExecuteSyncRequests(pgSyncRequests, c.pgDb); err != nil {
if err = c.userSyncStrategy.ExecuteSyncRequests(pgSyncRequests, c.pgDb); err != nil {
return fmt.Errorf("error executing sync statements: %v", err)
}
return nil