From 578aa95e136d36896db92b6d1479531952cd65c3 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Tue, 27 Jul 2021 10:26:23 +0200 Subject: [PATCH] update all wait_for_pod_failover functions --- e2e/tests/k8s_api.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/e2e/tests/k8s_api.py b/e2e/tests/k8s_api.py index 133fef93f..9937add88 100644 --- a/e2e/tests/k8s_api.py +++ b/e2e/tests/k8s_api.py @@ -469,6 +469,7 @@ class K8sBase: def wait_for_pod_failover(self, failover_targets, labels, namespace='default'): pod_phase = 'Failing over' new_pod_node = '' + pods_with_update_flag = self.count_pods_with_rolling_update_flag(labels, namespace) while (pod_phase != 'Running') or (new_pod_node not in failover_targets): pods = self.api.core_v1.list_namespaced_pod(namespace, label_selector=labels).items @@ -477,6 +478,10 @@ class K8sBase: pod_phase = pods[0].status.phase time.sleep(self.RETRY_TIMEOUT_SEC) + while pods_with_update_flag != 0: + pods_with_update_flag = self.count_pods_with_rolling_update_flag(labels, namespace) + time.sleep(self.RETRY_TIMEOUT_SEC) + def get_logical_backup_job(self, namespace='default'): return self.api.batch_v1_beta1.list_namespaced_cron_job(namespace, label_selector="application=spilo")