cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'andreyshestakov-devel' into devel

Browse source
This commit is contained in:
James Cammarata 2016-06-06 11:26:08 -05:00
commit b33aeee2f0
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/executor/process/result.py
View file

@ -106,7 +106,7 @@ class ResultProcess(multiprocessing.Process):
try: try:
result = self._read_worker_result() result = self._read_worker_result()
if result is None: if result is None:
time.sleep(0.0001) time.sleep(0.005)
continue continue
# send callbacks for 'non final' results # send callbacks for 'non final' results

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

@ -196,7 +196,7 @@ class StrategyBase:
self._cur_worker += 1 self._cur_worker += 1
if self._cur_worker >= len(self._workers): if self._cur_worker >= len(self._workers):
self._cur_worker = 0 self._cur_worker = 0
time.sleep(0.0001) time.sleep(0.005)
if queued: if queued:
break break
@ -389,7 +389,7 @@ class StrategyBase:
raise AnsibleError("unknown result message received: %s" % result[0]) raise AnsibleError("unknown result message received: %s" % result[0])
except Queue.Empty: except Queue.Empty:
time.sleep(0.0001) time.sleep(0.005)
if one_pass: if one_pass:
break break
@ -408,7 +408,7 @@ class StrategyBase:
while self._pending_results > 0 and not self._tqm._terminated: while self._pending_results > 0 and not self._tqm._terminated:
results = self._process_pending_results(iterator) results = self._process_pending_results(iterator)
ret_results.extend(results) ret_results.extend(results)
time.sleep(0.0001) time.sleep(0.005)
display.debug("no more pending results, returning what we have") display.debug("no more pending results, returning what we have")
return ret_results return ret_results