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

2024-11-08 17:33:54 +00:00 · 2014-09-16 13:49:14 -07:00 · 2014-09-16 13:49:14 -07:00 · 004dd5d9db
commit 004dd5d9db
parent a04f104465
1 changed files with 5 additions and 1 deletions
--- a/salt/utils/process.py
+++ b/salt/utils/process.py
@ -205,4 +205,8 @@ class ProcessManager(object):
        for pid, p_map in self._process_map.items():
            p_map['Process'].terminate()
            p_map['Process'].join()
+            # This is a race condition if a signal was passed to all children
+            try:
                del self._process_map[pid]
+            except KeyError:
+                pass