From 8d11677d1c2457701e015a49215aefe90b8b0337 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Thu, 1 Apr 2021 11:09:19 +0200 Subject: [PATCH] revert pooler change and minor update to version msg --- pkg/cluster/connection_pooler.go | 5 ++--- pkg/cluster/majorversionupgrade.go | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/cluster/connection_pooler.go b/pkg/cluster/connection_pooler.go index 9e5d8ce3d..db4f1f56d 100644 --- a/pkg/cluster/connection_pooler.go +++ b/pkg/cluster/connection_pooler.go @@ -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 // as per spec, hence do not skip syncing in that case, even though there // is no diff in specs - if (!needSync && len(masterChanges) <= 0 && len(replicaChanges) <= 0 && - c.ConnectionPooler != nil && (needConnectionPooler(&newSpec.Spec))) || - (c.ConnectionPooler == nil && !(needConnectionPooler(&newSpec.Spec))) { + if (!needSync && len(masterChanges) <= 0 && len(replicaChanges) <= 0) && + (c.ConnectionPooler != nil && (needConnectionPooler(&newSpec.Spec))) { c.logger.Debugln("syncing pooler is not required") return nil, nil } diff --git a/pkg/cluster/majorversionupgrade.go b/pkg/cluster/majorversionupgrade.go index a7bd82116..06dd979b2 100644 --- a/pkg/cluster/majorversionupgrade.go +++ b/pkg/cluster/majorversionupgrade.go @@ -52,7 +52,7 @@ func (c *Cluster) majorVersionUpgrade() error { desiredVersion := c.GetDesiredMajorVersionAsInt() 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 }