mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-08 14:20:04 -07:00
Add polling logic in runner such that all actions get kicked off everywhere then polling
happens only on needed hosts, allowing some hosts to fail and drop out of the running.
This commit is contained in:
parent
49a636d8a0
commit
db7ba87111
4 changed files with 71 additions and 50 deletions
|
@ -68,8 +68,6 @@ class Runner(object):
|
|||
basedir=None,
|
||||
setup_cache={},
|
||||
transport='paramiko',
|
||||
poll_interval=None,
|
||||
async_poll_callback=None,
|
||||
verbose=False):
|
||||
|
||||
'''
|
||||
|
@ -99,11 +97,6 @@ class Runner(object):
|
|||
self.remote_user = remote_user
|
||||
self.remote_pass = remote_pass
|
||||
self.background = background
|
||||
self.poll_interval = poll_interval
|
||||
self.async_poll_callback = async_poll_callback
|
||||
|
||||
if self.async_poll_callback is None:
|
||||
self.async_poll_callback = async_poll_status
|
||||
|
||||
if basedir is None:
|
||||
basedir = os.getcwd()
|
||||
|
@ -363,33 +356,6 @@ class Runner(object):
|
|||
result = self._execute_normal_module(conn, host, tmp)
|
||||
else:
|
||||
result = self._execute_async_module(conn, host, tmp)
|
||||
if self.poll_interval > 0:
|
||||
# poll for completion
|
||||
# FIXME: refactor
|
||||
|
||||
(host, ok, launch_result) = result
|
||||
jid = launch_result.get('ansible_job_id', None)
|
||||
if jid is None:
|
||||
return result
|
||||
if self.async_poll_callback is None:
|
||||
self.async_poll_callback = async_poll_callback
|
||||
self.module_name = 'async_status'
|
||||
self.module_args = [ "jid=%s" % jid ]
|
||||
clock = self.background
|
||||
while (clock >= 0):
|
||||
time.sleep(self.poll_interval)
|
||||
clock -= self.poll_interval
|
||||
result = self._execute_normal_module(conn, host, tmp)
|
||||
(host, ok, real_result) = result
|
||||
self.async_poll_callback(self, clock, self.poll_interval, ok, host, jid, real_result)
|
||||
if 'finished' in real_result or 'failed' in real_result:
|
||||
clock=-1
|
||||
elif (clock < 0 and not 'finished' in real_result):
|
||||
return [ host, False, "timer expired" ]
|
||||
|
||||
self._delete_remote_files(conn, tmp)
|
||||
conn.close()
|
||||
return result
|
||||
|
||||
elif self.module_name == 'copy':
|
||||
result = self._execute_copy(conn, host, tmp)
|
||||
|
|
|
@ -175,12 +175,12 @@ def path_dwim(basedir, given):
|
|||
else:
|
||||
return os.path.join(basedir, given)
|
||||
|
||||
def async_poll_status(runner, clock, poll_interval, ok, host, jid, result):
|
||||
if ok and 'finished' in result:
|
||||
print "<job %s> finished on %s" % (jid, host)
|
||||
elif not ok or 'failed' in result:
|
||||
print "<job %s> FAILED on %s" % (jid, host)
|
||||
def async_poll_status(jid, host, clock, result):
|
||||
if 'finished' in result:
|
||||
return "<job %s> finished on %s" % (jid, host)
|
||||
elif 'failed' in result:
|
||||
return "<job %s> FAILED on %s" % (jid, host)
|
||||
else:
|
||||
print "<job %s> polling on %s, %s remaining" % (jid, host, clock)
|
||||
return "<job %s> polling on %s, %s remaining" % (jid, host, clock)
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue