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

rename restartInstances to syncPostgreSQLConfiguration

This commit is contained in:
Felix Kunde 2021-07-30 14:37:43 +02:00
parent 20ca09507a
commit 8d5df0c758
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
e2e/tests/test_e2e.py
View File

@ -852,7 +852,7 @@ class EndToEndTestCase(unittest.TestCase):
try: try:
k8s.create_with_kubectl("manifests/complete-postgres-manifest.yaml") k8s.create_with_kubectl("manifests/complete-postgres-manifest.yaml")
k8s.wait_for_pod_start("spilo-role=master", self.test_namespace) k8s.wait_for_pod_start("spilo-role=master", self.test_namespace)
k8s.wait_for_pod_start('spilo-role=replica', self.test_namespace) k8s.wait_for_pod_start("spilo-role=replica", self.test_namespace)
self.assert_master_is_unique(self.test_namespace, "acid-test-cluster") self.assert_master_is_unique(self.test_namespace, "acid-test-cluster")
except timeout_decorator.TimeoutError: except timeout_decorator.TimeoutError:
@ -1501,7 +1501,6 @@ class EndToEndTestCase(unittest.TestCase):
} }
k8s.update_config(patch_delete_annotations) k8s.update_config(patch_delete_annotations)
def get_failover_targets(self, master_node, replica_nodes): def get_failover_targets(self, master_node, replica_nodes):
''' '''
If all pods live on the same node, failover will happen to other worker(s) If all pods live on the same node, failover will happen to other worker(s)

6
pkg/cluster/sync.go
View File

@ -394,11 +394,11 @@ func (c *Cluster) syncStatefulSet() error {
masterPod = &pods[i] masterPod = &pods[i]
continue continue
} }
c.restartInstance(&pod) c.syncPostgreSQLConfiguration(&pod)
} }
if masterPod != nil { if masterPod != nil {
c.restartInstance(masterPod) c.syncPostgreSQLConfiguration(masterPod)
} }
// if we get here we also need to re-create the pods (either leftovers from the old // if we get here we also need to re-create the pods (either leftovers from the old
@ -414,7 +414,7 @@ func (c *Cluster) syncStatefulSet() error {
return nil return nil
} }
func (c *Cluster) restartInstance(pod *v1.Pod) { func (c *Cluster) syncPostgreSQLConfiguration(pod *v1.Pod) {
podName := util.NameFromMeta(pod.ObjectMeta) podName := util.NameFromMeta(pod.ObjectMeta)
role := PostgresRole(pod.Labels[c.OpConfig.PodRoleLabel]) role := PostgresRole(pod.Labels[c.OpConfig.PodRoleLabel])