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

new restart operator function to be used in e2e test

This commit is contained in:
Felix Kunde 2020-04-17 12:01:05 +02:00
parent 22473cd537
commit c11d709ec0
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
e2e/tests/test_e2e.py
View File

@ -498,7 +498,7 @@ class EndToEndTestCase(unittest.TestCase):
self.assert_running_pods_have_volumes() self.assert_running_pods_have_volumes()
# get extra unused pvcs to test Sync # get extra unused pvcs to test Sync
k8s.wait_for_pg_to_scale(4) k8s.wait_for_pg_to_scale(3)
k8s.wait_for_pg_to_scale(2) k8s.wait_for_pg_to_scale(2)
# enable pvc deletion # enable pvc deletion
@ -510,9 +510,8 @@ class EndToEndTestCase(unittest.TestCase):
k8s.update_config(patch) k8s.update_config(patch)
# Sync() at operator start-up deletes unused pvcs that had existed before # Sync() at operator start-up deletes unused pvcs that had existed before
unused_pvcs = ["pgdata-acid-minimal-cluster-2", "pgdata-acid-minimal-cluster-3"] unused_pvc = "pgdata-acid-minimal-cluster-2"
for pvc in unused_pvcs: k8s.wait_for_pvc_deletion(unused_pvc)
k8s.wait_for_pvc_deletion(pvc)
self.assert_running_pods_have_volumes() self.assert_running_pods_have_volumes()
@ -520,7 +519,7 @@ class EndToEndTestCase(unittest.TestCase):
last_pvc_name = "pgdata-acid-minimal-cluster-0" last_pvc_name = "pgdata-acid-minimal-cluster-0"
volume_before_scaledown = k8s.get_volume_name(last_pvc_name) volume_before_scaledown = k8s.get_volume_name(last_pvc_name)
k8s.wait_for_pg_to_scale(0) k8s.wait_for_pg_to_scale(0)
k8s.update_config(patch) # force a Sync to delete unused PVCs k8s.restart_operator() # force a Sync to delete unused PVCs
self.assertTrue(k8s.pvc_exist(last_pvc_name), "The last pvc was deleted") self.assertTrue(k8s.pvc_exist(last_pvc_name), "The last pvc was deleted")
# sanity check # sanity check
@ -543,7 +542,7 @@ class EndToEndTestCase(unittest.TestCase):
# disablement of the feature actually stops volume deletion # disablement of the feature actually stops volume deletion
k8s.wait_for_pg_to_scale(2) k8s.wait_for_pg_to_scale(2)
self.assert_running_pods_have_volumes() self.assert_running_pods_have_volumes()
self.assertTrue(k8s.pvc_exist("pgdata-acid-minimal-cluster-2"), self.assertTrue(k8s.pvc_exist(unused_pvc),
"The pvc of a shut down pod was deleted despite the feature is disabled") "The pvc of a shut down pod was deleted despite the feature is disabled")
def get_failover_targets(self, master_node, replica_nodes): def get_failover_targets(self, master_node, replica_nodes):
@ -796,7 +795,9 @@ class K8s:
def update_config(self, config_map_patch): def update_config(self, config_map_patch):
self.api.core_v1.patch_namespaced_config_map("postgres-operator", "default", config_map_patch) self.api.core_v1.patch_namespaced_config_map("postgres-operator", "default", config_map_patch)
self.restart_operator()
def restart_operator(self):
operator_pod = self.api.core_v1.list_namespaced_pod( operator_pod = self.api.core_v1.list_namespaced_pod(
'default', label_selector="name=postgres-operator").items[0].metadata.name 'default', label_selector="name=postgres-operator").items[0].metadata.name
self.api.core_v1.delete_namespaced_pod(operator_pod, "default") # restart reloads the conf and issues Sync() self.api.core_v1.delete_namespaced_pod(operator_pod, "default") # restart reloads the conf and issues Sync()