public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make failure in retry a warning not an error. (#1188)

This commit is contained in:
Jan Mussler 2020-10-29 13:12:25 +01:00 committed by GitHub
parent 9a11e85d57
commit c694a72352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/cluster/database.go
View File

@ -131,12 +131,12 @@ func (c *Cluster) initDbConnWithName(dbname string) error {
} }
if _, ok := err.(*net.OpError); ok { if _, ok := err.(*net.OpError); ok {
c.logger.Errorf("could not connect to PostgreSQL database: %v", err) c.logger.Warningf("could not connect to Postgres database: %v", err)
return false, nil return false, nil
} }
if err2 := conn.Close(); err2 != nil { if err2 := conn.Close(); err2 != nil {
c.logger.Errorf("error when closing PostgreSQL connection after another error: %v", err) c.logger.Errorf("error when closing Postgres connection after another error: %v", err)
return false, err2 return false, err2
} }
@ -151,7 +151,7 @@ func (c *Cluster) initDbConnWithName(dbname string) error {
conn.SetMaxIdleConns(-1) conn.SetMaxIdleConns(-1)
if c.pgDb != nil { if c.pgDb != nil {
msg := "Closing an existing connection before opening a new one to %s" msg := "closing an existing connection before opening a new one to %s"
c.logger.Warningf(msg, dbname) c.logger.Warningf(msg, dbname)
c.closeDbConn() c.closeDbConn()
} }
@ -166,7 +166,7 @@ func (c *Cluster) connectionIsClosed() bool {
} }
func (c *Cluster) closeDbConn() (err error) { func (c *Cluster) closeDbConn() (err error) {
c.setProcessName("closing db connection") c.setProcessName("closing database connection")
if c.pgDb != nil { if c.pgDb != nil {
c.logger.Debug("closing database connection") c.logger.Debug("closing database connection")
if err = c.pgDb.Close(); err != nil { if err = c.pgDb.Close(); err != nil {
@ -181,7 +181,7 @@ func (c *Cluster) closeDbConn() (err error) {
} }
func (c *Cluster) readPgUsersFromDatabase(userNames []string) (users spec.PgUserMap, err error) { func (c *Cluster) readPgUsersFromDatabase(userNames []string) (users spec.PgUserMap, err error) {
c.setProcessName("reading users from the db") c.setProcessName("reading users from the database")
var rows *sql.Rows var rows *sql.Rows
users = make(spec.PgUserMap) users = make(spec.PgUserMap)
if rows, err = c.pgDb.Query(getUserSQL, pq.Array(userNames)); err != nil { if rows, err = c.pgDb.Query(getUserSQL, pq.Array(userNames)); err != nil {

4
pkg/controller/postgresql.go
View File

@ -225,11 +225,11 @@ func (c *Controller) processEvent(event ClusterEvent) {
switch event.EventType { switch event.EventType {
case EventAdd: case EventAdd:
if clusterFound { if clusterFound {
lg.Debugf("Recieved add event for existing cluster") lg.Infof("Recieved add event for already existing Postgres cluster")
return return
} }
lg.Infof("creation of the cluster started") lg.Infof("creating a new Postgres cluster")
cl = c.addCluster(lg, clusterName, event.NewSpec) cl = c.addCluster(lg, clusterName, event.NewSpec)