internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix inserting noop tasks by using active state (#36056)

Browse Source
This commit is contained in:
Martin Krizek
2018-06-06 12:34:25 +02:00
committed by GitHub
parent 8be3924d4e
commit 77e2bd5f8e
2 changed files with 186 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ansible/plugins/strategy/linear.py
View File

@@ -113,7 +113,7 @@ class StrategyModule(StrategyBase):
if host_tasks_to_run:
try:
lowest_cur_block = min(
(s.cur_block for h, (s, t) in host_tasks_to_run
(iterator.get_active_state(s).cur_block for h, (s, t) in host_tasks_to_run
if s.run_state != PlayIterator.ITERATING_COMPLETE))
except ValueError:
lowest_cur_block = None
@@ -125,6 +125,7 @@ class StrategyModule(StrategyBase):
for (k, v) in host_tasks_to_run:
(s, t) = v
s = iterator.get_active_state(s)
if s.cur_block > lowest_cur_block:
# Not the current block, ignore it
continue
@@ -158,6 +159,7 @@ class StrategyModule(StrategyBase):
if host_state_task is None:
continue
(s, t) = host_state_task
s = iterator.get_active_state(s)
if t is None:
continue
if s.run_state == cur_state and s.cur_block == cur_block: