public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-19 05:08:26 +02:00
Code Issues Projects Releases Wiki Activity

Do not create roles if cluster is masterless

Browse Source 
fix pod deletion
This commit is contained in:
Murat Kabilov
2017-05-12 11:41:34 +02:00
parent da438aab3a
commit a7c57874d5
5 changed files with 59 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/util.go
+11 -2
View File
@@ -171,7 +171,7 @@ func (c *Cluster) waitPodLabelsReady() error {
}
podsNumber := len(pods.Items)
return retryutil.Retry(c.OpConfig.ResourceCheckInterval, c.OpConfig.ResourceCheckTimeout,
err = retryutil.Retry(c.OpConfig.ResourceCheckInterval, c.OpConfig.ResourceCheckTimeout,
func() (bool, error) {
masterPods, err := c.KubeClient.Pods(namespace).List(masterListOption)
if err != nil {
@@ -185,11 +185,20 @@ func (c *Cluster) waitPodLabelsReady() error {
return false, fmt.Errorf("Too many masters")
}
if len(replicaPods.Items) == podsNumber {
return false, fmt.Errorf("Cluster has no master")
c.masterLess = true
return true, nil
}
return len(masterPods.Items)+len(replicaPods.Items) == podsNumber, nil
})
//TODO: wait for master for a while and then set masterLess flag
if err != nil {
return err
}
return nil
}
func (c *Cluster) waitStatefulsetPodsReady() error {