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

Remove redundant constants

This commit is contained in:
Murat Kabilov 2017-10-16 15:52:48 +02:00 committed by GitHub
parent 959b483d11
commit 5b29576a8e
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/cluster/pod.go
View File

@ -8,7 +8,6 @@ import (
"github.com/zalando-incubator/postgres-operator/pkg/spec" "github.com/zalando-incubator/postgres-operator/pkg/spec"
"github.com/zalando-incubator/postgres-operator/pkg/util" "github.com/zalando-incubator/postgres-operator/pkg/util"
"github.com/zalando-incubator/postgres-operator/pkg/util/constants"
) )
func (c *Cluster) listPods() ([]v1.Pod, error) { func (c *Cluster) listPods() ([]v1.Pod, error) {
@ -92,14 +91,13 @@ func (c *Cluster) registerPodSubscriber(podName spec.NamespacedName) chan spec.P
return ch return ch
} }
func (c *Cluster) recreatePod(pod v1.Pod) error { func (c *Cluster) recreatePod(podName spec.NamespacedName) error {
podName := util.NameFromMeta(pod.ObjectMeta)
c.setProcessName("recreating %q pod", podName) c.setProcessName("recreating %q pod", podName)
ch := c.registerPodSubscriber(podName) ch := c.registerPodSubscriber(podName)
defer c.unregisterPodSubscriber(podName) defer c.unregisterPodSubscriber(podName)
if err := c.KubeClient.Pods(pod.Namespace).Delete(pod.Name, c.deleteOptions); err != nil { if err := c.KubeClient.Pods(podName.Namespace).Delete(podName.Name, c.deleteOptions); err != nil {
return fmt.Errorf("could not delete pod: %v", err) return fmt.Errorf("could not delete pod: %v", err)
} }
@ -129,28 +127,29 @@ func (c *Cluster) recreatePods() error {
} }
c.logger.Infof("there are %d pods in the cluster to recreate", len(pods.Items)) c.logger.Infof("there are %d pods in the cluster to recreate", len(pods.Items))
var masterPod v1.Pod var masterPod *v1.Pod
replicas := make([]spec.NamespacedName, 0) replicas := make([]spec.NamespacedName, 0)
for _, pod := range pods.Items { for i, pod := range pods.Items {
role := c.podSpiloRole(&pod) role := PostgresRole(pod.Labels[c.OpConfig.PodRoleLabel])
if role == constants.PodRoleMaster { if role == Master {
masterPod = pod masterPod = &pods.Items[i]
continue continue
} }
if err := c.recreatePod(pod); err != nil { podName := util.NameFromMeta(pods.Items[i].ObjectMeta)
if err := c.recreatePod(podName); err != nil {
return fmt.Errorf("could not recreate replica pod %q: %v", util.NameFromMeta(pod.ObjectMeta), err) return fmt.Errorf("could not recreate replica pod %q: %v", util.NameFromMeta(pod.ObjectMeta), err)
} }
replicas = append(replicas, util.NameFromMeta(pod.ObjectMeta)) replicas = append(replicas, util.NameFromMeta(pod.ObjectMeta))
} }
if masterPod.Name == "" { if masterPod == nil {
c.logger.Warningln("no master pod in the cluster") c.logger.Warningln("no master pod in the cluster")
} else { } else {
if len(replicas) > 0 { 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)
} }
@ -158,7 +157,7 @@ func (c *Cluster) recreatePods() error {
//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))
if err := c.recreatePod(masterPod); err != nil { if err := c.recreatePod(util.NameFromMeta(masterPod.ObjectMeta)); err != nil {
return fmt.Errorf("could not recreate master pod %q: %v", util.NameFromMeta(masterPod.ObjectMeta), err) return fmt.Errorf("could not recreate master pod %q: %v", util.NameFromMeta(masterPod.ObjectMeta), err)
} }
} }

8
pkg/cluster/util.go
View File

@ -245,12 +245,12 @@ func (c *Cluster) waitPodLabelsReady() error {
} }
masterListOption := metav1.ListOptions{ masterListOption := metav1.ListOptions{
LabelSelector: labels.Merge(ls, labels.Set{ LabelSelector: labels.Merge(ls, labels.Set{
c.OpConfig.PodRoleLabel: constants.PodRoleMaster, c.OpConfig.PodRoleLabel: string(Master),
}).String(), }).String(),
} }
replicaListOption := metav1.ListOptions{ replicaListOption := metav1.ListOptions{
LabelSelector: labels.Merge(ls, labels.Set{ LabelSelector: labels.Merge(ls, labels.Set{
c.OpConfig.PodRoleLabel: constants.PodRoleReplica, c.OpConfig.PodRoleLabel: string(Replica),
}).String(), }).String(),
} }
pods, err := c.KubeClient.Pods(namespace).List(listOptions) pods, err := c.KubeClient.Pods(namespace).List(listOptions)
@ -345,8 +345,8 @@ func (c *Cluster) credentialSecretNameForCluster(username string, clusterName st
"tprgroup", constants.CRDGroup) "tprgroup", constants.CRDGroup)
} }
func (c *Cluster) podSpiloRole(pod *v1.Pod) string { func (c *Cluster) podSpiloRole(pod *v1.Pod) PostgresRole {
return pod.Labels[c.OpConfig.PodRoleLabel] return PostgresRole(pod.Labels[c.OpConfig.PodRoleLabel])
} }
func masterCandidate(replicas []spec.NamespacedName) spec.NamespacedName { func masterCandidate(replicas []spec.NamespacedName) spec.NamespacedName {

2
pkg/util/constants/postgresql.go
View File

@ -3,8 +3,6 @@ package constants
// PostgreSQL specific constants // PostgreSQL specific constants
const ( const (
DataVolumeName = "pgdata" DataVolumeName = "pgdata"
PodRoleMaster = "master"
PodRoleReplica = "replica"
PostgresDataMount = "/home/postgres/pgdata" PostgresDataMount = "/home/postgres/pgdata"
PostgresDataPath = PostgresDataMount + "/pgroot" PostgresDataPath = PostgresDataMount + "/pgroot"
) )