public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use same conf option in all cases

This commit is contained in:
Sergey Dudoladov 2019-01-28 16:57:26 +01:00
parent c6d36bb7ef
commit 1091d1a6ed
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/controller/node.go
View File

@ -80,16 +80,18 @@ func (c *Controller) nodeUpdate(prev, cur interface{}) {
if !c.nodeIsReady(nodePrev) || c.nodeIsReady(nodeCur) { if !c.nodeIsReady(nodePrev) || c.nodeIsReady(nodeCur) {
return return
} }
err := retryutil.Retry(2 * time.Minute, 10 * time.Minute,
err := retryutil.Retry(1 * time.Minute, c.opConfig.MasterPodMoveTimeout,
func() (bool, error) { func() (bool, error) {
err := c.moveMasterPodsOffNode(nodeCur) err := c.moveMasterPodsOffNode(nodeCur)
if err != nil { if err != nil {
return false, fmt.Errorf(("Unable to move master pods off the unschedulable node. Will retry after delay")) return false, fmt.Errorf("unable to move master pods off the unschedulable node; will retry after delay")
} }
return true, nil return true, nil
} ) } )
if err != nil { if err != nil {
c.logger.Warning("Unable to move maser pods") c.logger.Warning("failed to move master pods from the node %q: timeout expired", nodeCur.Name)
} }
} }