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

fix race condition where return value is omitted

Browse Source
This commit is contained in:
Thomas S Hatch 2013-09-25 22:15:38 -06:00
parent 29dbe592fe
commit 93a80bf715
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/ssh/__init__.py
View File

@ -247,6 +247,7 @@ class SSH(object):
que = multiprocessing.Queue()
running = {}
target_iter = self.targets.__iter__()
returned = set()
rets = set()
init = False
while True:
@ -272,12 +273,15 @@ class SSH(object):
ret = {}
try:
ret = que.get(False)
if 'id' in ret:
returned.add(ret['id'])
except Exception:
pass
for host in running:
if not running[host]['thread'].is_alive():
running[host]['thread'].join()
rets.add(host)
if host in returned:
if not running[host]['thread'].is_alive():
running[host]['thread'].join()
rets.add(host)
for host in rets:
if host in running:
running.pop(host)