From 7c0ee7389fc7c2d32bf0fad83d0e2dd6183e5a48 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Thu, 25 Jul 2019 13:44:41 +0000 Subject: [PATCH] Resolve hook errors after pxc reboot --- zaza/openstack/charm_tests/mysql/tests.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/zaza/openstack/charm_tests/mysql/tests.py b/zaza/openstack/charm_tests/mysql/tests.py index 6eb11a3..2d175c8 100644 --- a/zaza/openstack/charm_tests/mysql/tests.py +++ b/zaza/openstack/charm_tests/mysql/tests.py @@ -275,7 +275,15 @@ class PerconaClusterColdStartTest(PerconaClusterTest): self.nova_client.servers.start(uuid) logging.debug("Wait till model is idle ...") - zaza.model.block_until_all_units_idle() + # XXX If a hook was executing on a unit when it was powered off + # it comes back in an error state. + try: + zaza.model.block_until_all_units_idle() + except zaza.model.UnitError: + zaza.model.resolve_units( + application_name='percona-cluster', + wait=True) + zaza.model.block_until_all_units_idle() logging.debug("Wait for application states ...") for unit in zaza.model.get_units(self.application): zaza.model.run_on_unit(unit.entity_id, "hooks/update-status")