saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix issue in the timeout logic when calling all minions

Browse source
This commit is contained in:
Thomas S Hatch 2011-03-09 11:29:17 -07:00
parent 77f7000f0a
commit 790f45af60
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/client.py
View file

@ -72,7 +72,7 @@ class LocalClient(object):
specified jid
'''
jid_dir = os.path.join(self.opts['cachedir'], 'jobs', jid)
start = int(time.time())
start = 999999999999
ret = {}
# Wait for the hosts to check in
while True:
@ -80,8 +80,12 @@ class LocalClient(object):
if fn_.startswith('.'):
continue
if not ret.has_key(fn_):
ret[fn_] = pickle.load(open(os.path.join(jid_dir,
fn_, 'return.p'), 'r'))
retp = os.path.join(jid_dir, fn_, 'return.p')
if not os.path.isfile(retp):
continue
ret[fn_] = pickle.load(open(retp, 'r'))
if ret:
start = int(time.time())
if len(ret) >= len(minions):
return ret
if int(time.time()) > start + timeout: