propagate the error
This commit is contained in:
parent
b3b9e52f8b
commit
570f30b930
|
|
@ -304,7 +304,7 @@ func (c *Cluster) MigrateMasterPod(podName spec.NamespacedName) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
masterCandidateName := util.NameFromMeta(masterCandidatePod.ObjectMeta)
|
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) {
|
func() (bool, error) {
|
||||||
err := c.Switchover(oldMaster, masterCandidateName)
|
err := c.Switchover(oldMaster, masterCandidateName)
|
||||||
if err != nil {
|
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
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue