From 570f30b9307137c1b10c368e58bc636581bbe76d Mon Sep 17 00:00:00 2001
From: Sergey Dudoladov <sergey.dudoladov@gmail.com>
Date: Fri, 4 Jun 2021 10:46:59 +0200
Subject: [PATCH] propagate the error
---
pkg/cluster/pod.go | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pkg/cluster/pod.go b/pkg/cluster/pod.go
index a1cc0ffd..229648dd 100644
--- a/pkg/cluster/pod.go
+++ b/pkg/cluster/pod.go
@@ -304,7 +304,7 @@ func (c *Cluster) MigrateMasterPod(podName spec.NamespacedName) error {
}
masterCandidateName := util.NameFromMeta(masterCandidatePod.ObjectMeta)
- _ = retryutil.Retry(1*time.Minute, 5*time.Minute,
+ err = retryutil.Retry(1*time.Minute, 5*time.Minute,
func() (bool, error) {
err := c.Switchover(oldMaster, masterCandidateName)
if err != nil {
@@ -315,6 +315,10 @@ func (c *Cluster) MigrateMasterPod(podName spec.NamespacedName) error {
},
)
+ if err != nil {
+ return fmt.Errorf("could not migrate master pod: %v", err)
+ }
+
return nil
}
--
GitLab