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

revert pooler change and minor update to version msg

This commit is contained in:
Felix Kunde 2021-04-01 11:09:19 +02:00
parent f2979e2acf
commit 8d11677d1c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/cluster/connection_pooler.go
View File

@ -714,9 +714,8 @@ func (c *Cluster) syncConnectionPooler(oldSpec, newSpec *acidv1.Postgresql, Look
// Handling the case when connectionPooler is not there but it is required // Handling the case when connectionPooler is not there but it is required
// as per spec, hence do not skip syncing in that case, even though there // as per spec, hence do not skip syncing in that case, even though there
// is no diff in specs // is no diff in specs
if (!needSync && len(masterChanges) <= 0 && len(replicaChanges) <= 0 && if (!needSync && len(masterChanges) <= 0 && len(replicaChanges) <= 0) &&
c.ConnectionPooler != nil && (needConnectionPooler(&newSpec.Spec))) || (c.ConnectionPooler != nil && (needConnectionPooler(&newSpec.Spec))) {
(c.ConnectionPooler == nil && !(needConnectionPooler(&newSpec.Spec))) {
c.logger.Debugln("syncing pooler is not required") c.logger.Debugln("syncing pooler is not required")
return nil, nil return nil, nil
} }

2
pkg/cluster/majorversionupgrade.go
View File

@ -52,7 +52,7 @@ func (c *Cluster) majorVersionUpgrade() error {
desiredVersion := c.GetDesiredMajorVersionAsInt() desiredVersion := c.GetDesiredMajorVersionAsInt()
if c.currentMajorVersion >= desiredVersion { if c.currentMajorVersion >= desiredVersion {
c.logger.Infof("cluster version up to date. current: %d min desired: %d", c.currentMajorVersion, desiredVersion) c.logger.Infof("cluster version up to date. current: %d, min desired: %d", c.currentMajorVersion, desiredVersion)
return nil return nil
} }