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

Reap still running threads after timeout

Browse source 
This is an improvement to #49921 which reaps threads after the timeout
expires instead of letting them continue to take up resources.
This commit is contained in:
Toshio Kuratomi 2018-12-19 07:19:31 -08:00
parent d6fb42d1c5
commit ca90c138f4
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/facts/timeout.py
View file

@ -50,6 +50,8 @@ def timeout(seconds=None, error_message="Timer expired"):
except multiprocessing.TimeoutError: except multiprocessing.TimeoutError:
# This is an ansible.module_utils.common.facts.timeout.TimeoutError # This is an ansible.module_utils.common.facts.timeout.TimeoutError
raise TimeoutError('Timer expired after %s seconds' % timeout_value) raise TimeoutError('Timer expired after %s seconds' % timeout_value)
finally:
pool.terminate()
return wrapper return wrapper