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

remove triggering of the major version upgrade by the operator

This commit is contained in:
Sergey Dudoladov 2020-10-08 15:34:13 +02:00
parent 73f50b826e
commit 35a9f611dc
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/cluster/cluster.go
View File

@ -633,7 +633,7 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
// 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 newSpec.Spec.PostgresqlParam.PgVersion = oldSpec.Spec.PostgresqlParam.PgVersion
} else { } 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) oldSpec.Spec.PostgresqlParam.PgVersion, newSpec.Spec.PostgresqlParam.PgVersion)
} }
@ -790,18 +790,6 @@ func (c *Cluster) Update(oldSpec, newSpec *acidv1.Postgresql) error {
updateFailed = true 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 return nil
} }
@ -1515,14 +1503,3 @@ func (c *Cluster) needSyncConnectionPoolerDefaults(
return sync, reasons 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
}