From 35a9f611dca0db17025b19754c3efaf23f20d681 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Thu, 8 Oct 2020 15:34:13 +0200 Subject: [PATCH] remove triggering of the major version upgrade by the operator --- pkg/cluster/cluster.go | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index 7b7580d7a..f73d6825d 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -630,10 +630,10 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error { oldSpec.Spec.PostgresqlParam.PgVersion, newSpec.Spec.PostgresqlParam.PgVersion) c.eventRecorder.Eventf(c.GetReference(), v1.EventTypeWarning, "PostgreSQL", "postgresql version change(%q -> %q) has no effect", oldSpec.Spec.PostgresqlParam.PgVersion, newSpec.Spec.PostgresqlParam.PgVersion) - //we need that hack to generate statefulset with the old version + // we need that hack to generate statefulset with the old version newSpec.Spec.PostgresqlParam.PgVersion = oldSpec.Spec.PostgresqlParam.PgVersion } else { - c.logger.Infof("postgresql version increased (%q -> %q), major version upgrade will start after StatefulSet Sync", + c.logger.Infof("postgresql version increased (%q -> %q), major version upgrade can be done manually after StatefulSet Sync", oldSpec.Spec.PostgresqlParam.PgVersion, newSpec.Spec.PostgresqlParam.PgVersion) } @@ -790,18 +790,6 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error { updateFailed = true } - // major version upgrade should run only when all changes to pods have completed - if oldSpec.Spec.PostgresqlParam.PgVersion < newSpec.Spec.PostgresqlParam.PgVersion { - c.logger.Infof("postgresql version increased (%q -> %q), triggering major version upgrade", - oldSpec.Spec.PostgresqlParam.PgVersion, newSpec.Spec.PostgresqlParam.PgVersion) - c.eventRecorder.Eventf(c.GetReference(), v1.EventTypeWarning, "PostgreSQL", "postgresql version increased (%q -> %q), triggering major version upgrade", - oldSpec.Spec.PostgresqlParam.PgVersion, newSpec.Spec.PostgresqlParam.PgVersion) - if err := c.triggerMajorVersionUpgrade(&newSpec.Spec); err != nil { - c.logger.Errorf("major version upgrade failed: %v", err) - updateFailed = true - } - } - return nil } @@ -1515,14 +1503,3 @@ func (c *Cluster) needSyncConnectionPoolerDefaults( return sync, reasons } - -func (c *Cluster) triggerMajorVersionUpgrade(newSpec *acidv1.PostgresSpec) (err error) { - masterPod, err := c.getRolePods(Master) - if err != nil { - return fmt.Errorf("could not get master pod: %v", err) - } - masterNamespacedName := spec.NamespacedName{Namespace: masterPod[0].Namespace, Name: masterPod[0].Name} - - _, err = c.ExecCommand(&masterNamespacedName, "python3", "/scripts/inplace_upgrade.py", fmt.Sprintf("%d", c.getNumberOfInstances(newSpec))) - return err -}