arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add check to include subordinates for idleness

Browse Source 
Depends-On: https://github.com/openstack-charmers/zaza/pull/346
This commit is contained in:
Chris MacNaughton
2020-04-17 16:42:19 +02:00
parent 5f4a2def28
commit 28e1ce2d3f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zaza/openstack/utilities/parallel_series_upgrade.py
+6 -4
View File
@@ -207,7 +207,8 @@ async def parallel_series_upgrade(
await series_upgrade_utils.async_set_series(
application, to_series=to_series)
app_idle = [
model.async_wait_for_unit_idle(unit) for unit in status["units"]
model.async_wait_for_unit_idle(unit, include_subordinates=True)
for unit in status["units"]
]
await asyncio.gather(*app_idle)
prepare_group = [
@@ -308,7 +309,7 @@ async def serial_series_upgrade(
await series_upgrade_utils.async_set_series(
application, to_series=to_series)
if not follower_first and leader_machine not in completed_machines:
await model.async_wait_for_unit_idle(leader)
await model.async_wait_for_unit_idle(leader, include_subordinates=True)
await prepare_series_upgrade(leader_machine, to_series=to_series)
logging.info("About to upgrade leader of {}: {}"
.format(application, leader_machine))
@@ -325,7 +326,8 @@ async def serial_series_upgrade(
machine = unit['machine']
if machine in completed_machines:
continue
await model.async_wait_for_unit_idle(unit_name)
await model.async_wait_for_unit_idle(
unit_name, include_subordinates=True)
await prepare_series_upgrade(machine, to_series=to_series)
logging.info("About to upgrade follower of {}: {}"
.format(application, machine))
@@ -338,7 +340,7 @@ async def serial_series_upgrade(
completed_machines.append(machine)
if follower_first and leader_machine not in completed_machines:
await model.async_wait_for_unit_idle(leader)
await model.async_wait_for_unit_idle(leader, include_subordinates=True)
await prepare_series_upgrade(leader_machine, to_series=to_series)
logging.info("About to upgrade leader of {}: {}"
.format(application, leader_machine))