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

Avoid error messages in operator logs for syncing 

users and databases
This commit is contained in:
Rafia Sabih 2019-06-20 15:21:34 +02:00
parent 6daecf10e4
commit e90679c1c7
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cluster/cluster.go
View File

@ -287,7 +287,7 @@ func (c *Cluster) Create() error {
c.logger.Infof("pods are ready") c.logger.Infof("pods are ready")
// create database objects unless we are running without pods or disabled that feature explicitly // create database objects unless we are running without pods or disabled that feature explicitly
if !(c.databaseAccessDisabled() || c.getNumberOfInstances(&c.Spec) <= 0) { if !(c.databaseAccessDisabled() || c.getNumberOfInstances(&c.Spec) <= 0 || c.Spec.StandbyCluster != nil) {
if err = c.createRoles(); err != nil { if err = c.createRoles(); err != nil {
return fmt.Errorf("could not create users: %v", err) return fmt.Errorf("could not create users: %v", err)
} }
@ -626,7 +626,7 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
}() }()
// Roles and Databases // Roles and Databases
if !(c.databaseAccessDisabled() || c.getNumberOfInstances(&c.Spec) <= 0) { if !(c.databaseAccessDisabled() || c.getNumberOfInstances(&c.Spec) <= 0 || c.Spec.StandbyCluster != nil) {
c.logger.Debugf("syncing roles") c.logger.Debugf("syncing roles")
if err := c.syncRoles(); err != nil { if err := c.syncRoles(); err != nil {
c.logger.Errorf("could not sync roles: %v", err) c.logger.Errorf("could not sync roles: %v", err)

6
pkg/cluster/sync.go
View File

@ -90,7 +90,7 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
} }
// create database objects unless we are running without pods or disabled that feature explicitly // create database objects unless we are running without pods or disabled that feature explicitly
if !(c.databaseAccessDisabled() || c.getNumberOfInstances(&newSpec.Spec) <= 0) { if !(c.databaseAccessDisabled() || c.getNumberOfInstances(&newSpec.Spec) <= 0 || c.Spec.StandbyCluster != nil) {
c.logger.Debugf("syncing roles") c.logger.Debugf("syncing roles")
if err = c.syncRoles(); err != nil { if err = c.syncRoles(); err != nil {
err = fmt.Errorf("could not sync roles: %v", err) err = fmt.Errorf("could not sync roles: %v", err)
@ -428,10 +428,6 @@ func (c *Cluster) syncSecrets() error {
func (c *Cluster) syncRoles() (err error) { func (c *Cluster) syncRoles() (err error) {
c.setProcessName("syncing roles") c.setProcessName("syncing roles")
if c.Spec.StandbyCluster != nil {
c.logger.Info("no need to sync roles for standby cluster")
return nil
}
var ( var (
dbUsers spec.PgUserMap dbUsers spec.PgUserMap
userNames []string userNames []string