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

An additional race condition in shutdown-- if the signal is sent to all children

Browse Source
This commit is contained in:
Thomas Jackson 2014-09-16 13:49:14 -07:00
parent a04f104465
commit 004dd5d9db
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/utils/process.py
View File

@ -205,4 +205,8 @@ class ProcessManager(object):
for pid, p_map in self._process_map.items():
p_map['Process'].terminate()
p_map['Process'].join()
del self._process_map[pid]
# This is a race condition if a signal was passed to all children
try:
del self._process_map[pid]
except KeyError:
pass