From 4df0cbee8ce6a70926d1fa953c0859409000437c Mon Sep 17 00:00:00 2001
From: Dariusz Smigiel <1412617+dasm@users.noreply.github.com>
Date: Fri, 2 Apr 2021 11:40:07 -0700
Subject: [PATCH] Moved block_until_idle immediately after force-quorum cmd

---
 zaza/openstack/charm_tests/mysql/tests.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/zaza/openstack/charm_tests/mysql/tests.py b/zaza/openstack/charm_tests/mysql/tests.py
index 219d25b..5cc563d 100644
--- a/zaza/openstack/charm_tests/mysql/tests.py
+++ b/zaza/openstack/charm_tests/mysql/tests.py
@@ -665,6 +665,13 @@ class MySQLInnoDBClusterColdStartTest(MySQLBaseTest):
             "Results from running 'force-quorum' command ...\n{}".format(
                 action.data))
 
+        logging.info("Wait till model is idle ...")
+        try:
+            zaza.model.block_until_all_units_idle()
+        except zaza.model.UnitError:
+            self.resolve_update_status_errors()
+            zaza.model.block_until_all_units_idle()
+
         # Unblock all traffic across mysql instances
         for unit in zaza.model.get_units(self.application):
             cmd = "sudo iptables -F"
@@ -677,13 +684,6 @@ class MySQLInnoDBClusterColdStartTest(MySQLBaseTest):
         zaza.model.wait_for_application_states(
             states=test_config.get("target_deploy_status", {}))
 
-        logging.info("Wait till model is idle ...")
-        try:
-            zaza.model.block_until_all_units_idle()
-        except zaza.model.UnitError:
-            self.resolve_update_status_errors()
-            zaza.model.block_until_all_units_idle()
-
 
 class MySQL8MigrationTests(MySQLBaseTest):
     """Percona Cluster to MySQL InnoDB Cluster Tests."""