wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove sleeps and rely on regular queue options to process results

Browse source
This commit is contained in:
James Cammarata 2016-08-11 08:17:50 -05:00
parent aef20c4242
commit 68d44e48ba
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/plugins/strategy/__init__.py
View file

@ -254,9 +254,10 @@ class StrategyBase:
continue
return None
while not self._final_q.empty() and not self._tqm._terminated:
passes = 0
while not self._tqm._terminated:
try:
task_result = self._final_q.get(block=False)
task_result = self._final_q.get(timeout=0.001)
original_host = get_original_host(task_result._host)
original_task = iterator.get_original_task(original_host, task_result._task)
task_result._host = original_host
@ -451,7 +452,9 @@ class StrategyBase:
ret_results.append(task_result)
except Queue.Empty:
time.sleep(0.005)
passes += 1
if passes > 2:
break
if one_pass:
break
@ -474,7 +477,6 @@ class StrategyBase:
results = self._process_pending_results(iterator)
ret_results.extend(results)
time.sleep(0.005)
display.debug("no more pending results, returning what we have")