mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-27 12:51:25 -07:00
Reworking iterator logic regarding failed states during always
Previous changes addressed a corner case, which unfortunately introduced another bug. This patch adds a new flag to the host state (did_rescue) which is set to true when the rescue portion of a block completes. This flag is then checked in _check_failed_state() when the fail_state != FAILED_NONE. This lead to the discovery of another bug - current strategies are not advancing hosts to ITERATING_COMPLETE after doing a peek at the next task, leaving the host state in the run_state of the final task. To address this, before gathering the list of failed hosts in StrategyBase.run(), a final pass through the iterator for all hosts is done to ensure each host is in its final state. This way, no strategy derived from StrategyBase has to worry about it and it's handled. Fixes #17983
This commit is contained in:
parent
afaec3da82
commit
ca5b361ad8
3 changed files with 34 additions and 21 deletions
|
@ -331,8 +331,8 @@ class TestStrategyBase(unittest.TestCase):
|
|||
self.assertEqual(results[0], task_result)
|
||||
self.assertEqual(strategy_base._pending_results, 0)
|
||||
self.assertNotIn('test01', strategy_base._blocked_hosts)
|
||||
self.assertIn('test01', mock_tqm._failed_hosts)
|
||||
del mock_tqm._failed_hosts['test01']
|
||||
#self.assertIn('test01', mock_tqm._failed_hosts)
|
||||
#del mock_tqm._failed_hosts['test01']
|
||||
mock_iterator.is_failed.return_value = False
|
||||
|
||||
task_result = TaskResult(host=mock_host.name, task=mock_task._uuid, return_data='{"unreachable": true}')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue