ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-28 03:00:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Don't pass runner instance through the mulitprocessing queue, fix temp dir removal

Browse source
This commit is contained in:
Michael DeHaan 2012-10-23 08:04:32 -04:00
parent 51d8e042df
commit 856dd5a9aa
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/runner/__init__.py
View file

@ -53,6 +53,7 @@ lookup_plugin_list = utils.import_plugins(os.path.join(dirname, 'lookup_plugins'
for i in reversed(C.DEFAULT_LOOKUP_PLUGIN_PATH.split(os.pathsep)): for i in reversed(C.DEFAULT_LOOKUP_PLUGIN_PATH.split(os.pathsep)):
lookup_plugin_list.update(utils.import_plugins(i)) lookup_plugin_list.update(utils.import_plugins(i))
multiprocessing_runner = None
################################################ ################################################
@ -67,9 +68,8 @@ def _executor_hook(job_queue, result_queue):
signal.signal(signal.SIGINT, signal.SIG_IGN) signal.signal(signal.SIGINT, signal.SIG_IGN)
while not job_queue.empty(): while not job_queue.empty():
try: try:
job = job_queue.get(block=False) host = job_queue.get(block=False)
runner, host = job result_queue.put(multiprocessing_runner._executor(host))
result_queue.put(runner._executor(host))
except Queue.Empty: except Queue.Empty:
pass pass
except: except:
@ -240,7 +240,7 @@ class Runner(object):
cmd = shebang.replace("#!","") + " " + cmd cmd = shebang.replace("#!","") + " " + cmd
if tmp.find("tmp") != -1: if tmp.find("tmp") != -1:
cmd = cmd + "; rm -rf %s > /tmp/del.log 2>&1" % tmp cmd = cmd + "; rm -rf %s >/dev/null 2>&1" % tmp
cmd = cmd_mod + cmd cmd = cmd_mod + cmd
res = self._low_level_exec_command(conn, cmd, tmp, sudoable=True) res = self._low_level_exec_command(conn, cmd, tmp, sudoable=True)
return ReturnData(conn=conn, result=res) return ReturnData(conn=conn, result=res)
@ -630,7 +630,8 @@ class Runner(object):
self.callbacks.on_no_hosts() self.callbacks.on_no_hosts()
return dict(contacted={}, dark={}) return dict(contacted={}, dark={})
hosts = [ (self,x) for x in hosts ] global multiprocessing_runner
multiprocessing_runner = self
results = None results = None
# Check if this is an action plugin. Some of them are designed # Check if this is an action plugin. Some of them are designed
@ -648,13 +649,13 @@ class Runner(object):
# Create a ResultData item for each host in this group # Create a ResultData item for each host in this group
# using the returned result. If we didn't do this we would # using the returned result. If we didn't do this we would
# get false reports of dark hosts. # get false reports of dark hosts.
results = [ ReturnData(host=h[1], result=result_data, comm_ok=True) \ results = [ ReturnData(host=h, result=result_data, comm_ok=True) \
for h in hosts ] for h in hosts ]
del self.host_set del self.host_set
elif self.forks > 1: elif self.forks > 1:
results = self._parallel_exec(hosts) results = self._parallel_exec(hosts)
else: else:
results = [ self._executor(h[1]) for h in hosts ] results = [ self._executor(h) for h in hosts ]
return self._partition_results(results) return self._partition_results(results)
# ***************************************************** # *****************************************************