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

Only attempt upgrade if update is ok.

This commit is contained in:
Jan Mußler 2021-02-25 11:20:14 +01:00
parent 3463e8531b
commit 92a855372d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cluster/cluster.go
View File

@ -780,8 +780,12 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
updateFailed = true updateFailed = true
} }
if err := c.majorVersionUpgrade(); err != nil { if !updateFailed {
c.logger.Errorf("major version upgrade failed: %v", err) // Major version upgrade must only fire after success of earlier operations and should stay last
if err := c.majorVersionUpgrade(); err != nil {
c.logger.Errorf("major version upgrade failed: %v", err)
updateFailed = true
}
} }
return nil return nil

1
pkg/cluster/sync.go
View File

@ -118,6 +118,7 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error {
return fmt.Errorf("could not sync connection pooler: %v", err) return fmt.Errorf("could not sync connection pooler: %v", err)
} }
// Major version upgrade must only run after success of all earlier operations, must remain last item in sync
if err := c.majorVersionUpgrade(); err != nil { if err := c.majorVersionUpgrade(); err != nil {
c.logger.Errorf("major version upgrade failed: %v", err) c.logger.Errorf("major version upgrade failed: %v", err)
} }