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

no pgUsers check needed when filling cache

This commit is contained in:
Felix Kunde 2021-04-21 17:36:14 +02:00
parent 5eac3e86ac
commit eb20c5829b
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/cluster/cluster.go
View File

@ -645,12 +645,11 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
if !sameUsers || needConnectionPooler {
c.logger.Debugf("initialize users")
// save current state of pgUsers to check for deleted roles later
if len(c.pgUsers) > 0 {
c.pgUsersCache = map[string]spec.PgUser{}
for k, v := range c.pgUsers {
c.pgUsersCache[k] = v
}
c.pgUsersCache = map[string]spec.PgUser{}
for k, v := range c.pgUsers {
c.pgUsersCache[k] = v
}
if err := c.initUsers(); err != nil {
c.logger.Errorf("could not init users: %v", err)
updateFailed = true

9
pkg/cluster/sync.go
View File

@ -38,12 +38,11 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
}()
// save current state of pgUsers to check for deleted roles later
if len(c.pgUsers) > 0 {
c.pgUsersCache = map[string]spec.PgUser{}
for k, v := range c.pgUsers {
c.pgUsersCache[k] = v
}
c.pgUsersCache = map[string]spec.PgUser{}
for k, v := range c.pgUsers {
c.pgUsersCache[k] = v
}
if err = c.initUsers(); err != nil {
err = fmt.Errorf("could not init users: %v", err)
return err