From 0c5dfeab064e51228348d1b8cea68e4981aba256 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Mon, 20 Apr 2020 14:05:33 +0200 Subject: [PATCH] rename --- pkg/cluster/pod.go | 2 +- pkg/util/patroni/patroni.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/cluster/pod.go b/pkg/cluster/pod.go index 6ad1c051e..a734e4835 100644 --- a/pkg/cluster/pod.go +++ b/pkg/cluster/pod.go @@ -305,7 +305,7 @@ func (c *Cluster) isSafeToRecreatePods(pods *v1.PodList) bool { */ for _, pod := range pods.Items { - state, err := c.patroni.GetNodeState(&pod) + state, err := c.patroni.GetPatroniMemberState(&pod) if err != nil || state == "creating replica" { c.logger.Warningf("cannot re-create replica %s: it is currently being initialized", pod.Name) return false diff --git a/pkg/util/patroni/patroni.go b/pkg/util/patroni/patroni.go index cc8cd9c18..008dc3e58 100644 --- a/pkg/util/patroni/patroni.go +++ b/pkg/util/patroni/patroni.go @@ -26,7 +26,7 @@ const ( type Interface interface { Switchover(master *v1.Pod, candidate string) error SetPostgresParameters(server *v1.Pod, options map[string]string) error - GetNodeState(pod *v1.Pod) (string, error) + GetPatroniMemberState(pod *v1.Pod) (string, error) } // Patroni API client @@ -126,8 +126,8 @@ func (p *Patroni) SetPostgresParameters(server *v1.Pod, parameters map[string]st return p.httpPostOrPatch(http.MethodPatch, apiURLString+configPath, buf) } -//GetNodeState returns node state reported by Patroni API call. -func (p *Patroni) GetNodeState(server *v1.Pod) (string, error) { +//GetPatroniMemberState returns node state reported by Patroni API call. +func (p *Patroni) GetPatroniMemberState(server *v1.Pod) (string, error) { apiURLString, err := apiURL(server) if err != nil {