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

Merge branch 'master' into crd

This commit is contained in:
Murat Kabilov 2017-10-09 11:55:18 +02:00
parent c773a8b2f8 3b8c06416e
commit 71a540ff48
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cluster/pod.go
View File

@ -146,10 +146,12 @@ func (c *Cluster) recreatePods() error {
if masterPod.Name == "" { if masterPod.Name == "" {
c.logger.Warningln("no master pod in the cluster") c.logger.Warningln("no master pod in the cluster")
} else { } else {
if len(replicas) > 0 {
err := c.ManualFailover(&masterPod, masterCandidate(replicas)) err := c.ManualFailover(&masterPod, masterCandidate(replicas))
if err != nil { if err != nil {
return fmt.Errorf("could not perform manual failover: %v", err) return fmt.Errorf("could not perform manual failover: %v", err)
} }
}
//TODO: specify master, leave new master empty //TODO: specify master, leave new master empty
c.logger.Infof("recreating master pod %q", util.NameFromMeta(masterPod.ObjectMeta)) c.logger.Infof("recreating master pod %q", util.NameFromMeta(masterPod.ObjectMeta))