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

minor changes

This commit is contained in:
Felix Kunde 2020-08-28 09:48:46 +02:00
parent 70da322f96
commit 78dc2190a9
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
e2e/tests/test_e2e.py
View File

@ -695,7 +695,7 @@ class EndToEndTestCase(unittest.TestCase):
if len(failover_targets) == 0: if len(failover_targets) == 0:
nodes = k8s.api.core_v1.list_node(label_selector=k8s_master_exclusion) nodes = k8s.api.core_v1.list_node(label_selector=k8s_master_exclusion)
for n in nodes.items: for n in nodes.items:
if "node-role.kubernetes.io/master" not in n.metadata.labels and n.metadata.name != master_node: if n.metadata.name != master_node:
failover_targets.append(n.metadata.name) failover_targets.append(n.metadata.name)
return failover_targets return failover_targets
@ -734,6 +734,7 @@ class EndToEndTestCase(unittest.TestCase):
Toggle pod anti affinty to distribute pods accross nodes (replica in particular). Toggle pod anti affinty to distribute pods accross nodes (replica in particular).
''' '''
k8s = self.k8s k8s = self.k8s
failover_targets = self.get_failover_targets(master_node, replica_nodes)
# enable pod anti affintiy in config map which should trigger movement of replica # enable pod anti affintiy in config map which should trigger movement of replica
patch_enable_antiaffinity = { patch_enable_antiaffinity = {
@ -742,12 +743,7 @@ class EndToEndTestCase(unittest.TestCase):
} }
} }
k8s.update_config(patch_enable_antiaffinity) k8s.update_config(patch_enable_antiaffinity)
k8s.wait_for_pod_start('spilo-role=master') self.assert_failover(master_node, len(replica_nodes), failover_targets, cluster_label)
k8s.wait_for_pod_start('spilo-role=replica')
current_master_node, current_replica_nodes = k8s.get_pg_nodes(cluster_label)
self.assertNotEqual(current_master_node, current_replica_nodes,
"Both pods are still on the same node {}".format(current_master_node))
# now disable pod anti affintiy again which will cause yet another failover # now disable pod anti affintiy again which will cause yet another failover
patch_disable_antiaffinity = { patch_disable_antiaffinity = {