From 916b6fe1d72073abca498686c88e571d0003deeb Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Fri, 8 Oct 2021 16:03:05 +0200
Subject: [PATCH] minor changes

---
 pkg/cluster/sync.go         | 2 +-
 pkg/util/patroni/patroni.go | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go
index a0d8c0748..c763d4bdb 100644
--- a/pkg/cluster/sync.go
+++ b/pkg/cluster/sync.go
@@ -404,7 +404,7 @@ func (c *Cluster) syncStatefulSet() error {
 		}
 
 		// empty config probably means cluster is not fully initialized yet, e.g. restoring from backup
-		// to not attempt a restart in such situation
+		// do not attempt a restart
 		if !reflect.DeepEqual(patroniConfig, emptyPatroniConfig) || len(pgParameters) > 0 {
 			instanceRestartRequired, err = c.checkAndSetGlobalPostgreSQLConfiguration(&pod, patroniConfig, pgParameters)
 			if err != nil {
diff --git a/pkg/util/patroni/patroni.go b/pkg/util/patroni/patroni.go
index 37a799859..ad6532995 100644
--- a/pkg/util/patroni/patroni.go
+++ b/pkg/util/patroni/patroni.go
@@ -227,7 +227,7 @@ func (p *Patroni) GetConfig(server *v1.Pod) (acidv1.Patroni, map[string]string,
 	return patroniConfig, pgParameters, err
 }
 
-//Restart method restarts instance via Patroni POST API call.
+// Restart method restarts instance via Patroni POST API call.
 func (p *Patroni) Restart(server *v1.Pod) error {
 	buf := &bytes.Buffer{}
 	err := json.NewEncoder(buf).Encode(map[string]interface{}{"restart_pending": true})
@@ -238,8 +238,12 @@ func (p *Patroni) Restart(server *v1.Pod) error {
 	if err != nil {
 		return err
 	}
-	memberData, _ := p.GetMemberData(server)
+	memberData, err := p.GetMemberData(server)
+	if err != nil {
+		return err
+	}
 
+	// do restart only when it is pending
 	if !memberData.PendingRestart {
 		return nil
 	}