valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change syndic_wait in get_iter_returns

Browse Source 
This will ensure we only do the quick return if you are *not* a syndic, since when you are a syndic we have no idea what the target is-- so we have to wait. This means that syndic masters (the master of masters) will have at least syndic_wait seconds until the return comes back
This commit is contained in:
Thomas Jackson 2014-10-28 17:19:43 -07:00
parent 4a6f0a3c20
commit f997d24cfa
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
salt/client/__init__.py
View File

@ -887,23 +887,11 @@ class LocalClient(object):
log.debug('jid {0} return from {1}'.format(jid, raw['data']['id']))
yield ret
# if we have all of the returns, no need for anything fancy
if len(found.intersection(minions)) >= len(minions):
# if you are a master of masters
if (self.opts['order_masters'] and
# and if you have more syndic_wait to add
syndic_wait < self.opts.get('syndic_wait', 1) and
# add you would have timed out
time.time() >= timeout_at):
syndic_wait += 1
# add one, so as to only add a max of opts['syndic_wait']
timeout_at += 1
log.debug('jid {0} syndic_wait {1} will now timeout at {2}'.format(
jid, syndic_wait, datetime.fromtimestamp(timeout_at).time()))
else:
# All minions have returned, break out of the loop
log.debug('jid {0} found all minions {1}'.format(jid, found))
break
# if we have all of the returns (and we aren't a syndic), no need for anything fancy
if len(found.intersection(minions)) >= len(minions) and not self.opts['order_masters']:
# All minions have returned, break out of the loop
log.debug('jid {0} found all minions {1}'.format(jid, found))
break
# let start the timeouts for all remaining minions
for id_ in minions - found:
@ -933,6 +921,9 @@ class LocalClient(object):
else:
jinfo_iter = self.get_returns_no_block(jinfo['jid'], event=event)
timeout_at = time.time() + self.opts['gather_job_timeout']
# if you are a syndic, wait a little longer
if self.opts['order_masters']:
timeout_at += self.opts.get('syndic_wait', 1)
# check for minions that are running the job still
for raw in jinfo_iter: