address review

This commit is contained in:
Sergey Dudoladov 2021-01-07 17:02:02 +01:00
parent ca129eb9da
commit c692c6ec34
1 changed files with 5 additions and 3 deletions

View File

@ -312,18 +312,17 @@ func (c *Cluster) isSafeToRecreatePods(pods *v1.PodList) bool {
for _, pod := range pods.Items { for _, pod := range pods.Items {
var state string
err := retryutil.Retry(3*time.Second, 15*time.Second, err := retryutil.Retry(3*time.Second, 15*time.Second,
func() (bool, error) { func() (bool, error) {
var state string
var err error var err error
state, err = c.patroni.GetPatroniMemberState(&pod) state, err = c.patroni.GetPatroniMemberState(&pod)
if err != nil { if err != nil {
return false, err return false, err
} else if state == "creating replica" {
return false, fmt.Errorf("cannot re-create replica %s: it is currently being initialized", pod.Name)
} }
return true, nil return true, nil
}, },
@ -332,6 +331,9 @@ func (c *Cluster) isSafeToRecreatePods(pods *v1.PodList) bool {
if err != nil { if err != nil {
c.logger.Errorf("failed to get Patroni state for pod: %s", err) c.logger.Errorf("failed to get Patroni state for pod: %s", err)
return false return false
} else if state == "creating replica" {
c.logger.Errorf("cannot re-create replica %s: it is currently being initialized", pod.Name)
return false
} }
} }