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

If the timeout in _poll_async_result has expired, raise the exception (#35878)

Browse source
This commit is contained in:
Toshio Kuratomi 2018-02-07 22:57:16 -08:00 committed by GitHub
parent 0ccef03b43
commit 82c1456781
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/executor/task_executor.py
View file

@ -729,7 +729,12 @@ class TaskExecutor:
except AttributeError:
pass
time_left -= self._task.poll
# Little hack to raise the exception if we've exhausted the timeout period
time_left -= self._task.poll
if time_left <= 0:
raise
else:
time_left -= self._task.poll
if int(async_result.get('finished', 0)) != 1:
if async_result.get('_ansible_parsed'):