From 92a855372d7d98720721472f0cae62f1e1e8d724 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Mu=C3=9Fler?= Date: Thu, 25 Feb 2021 11:20:14 +0100 Subject: [PATCH] Only attempt upgrade if update is ok. --- pkg/cluster/cluster.go | 8 ++++++-- pkg/cluster/sync.go | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index c558d3080..c3e3ec905 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -780,8 +780,12 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error { updateFailed = true } - if err := c.majorVersionUpgrade(); err != nil { - c.logger.Errorf("major version upgrade failed: %v", err) + if !updateFailed { + // 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 diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go index c6bc70836..d104fd6e0 100644 --- a/pkg/cluster/sync.go +++ b/pkg/cluster/sync.go @@ -118,6 +118,7 @@ func (c *Cluster) Sync(newSpec *acidv1.Postgresql) error { 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 { c.logger.Errorf("major version upgrade failed: %v", err) }