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

Merge pull request #37306 from DSRCorporation/bugs/35480_master_shutdown_no_process_error

Browse source 
Don't use os.wait() on subprocesses managed by `multiprocessing`.
This commit is contained in:
Mike Place 2016-10-31 19:55:30 +13:00 • committed by GitHub
commit 7f1654894d
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
salt/utils/process.py
View file

@ -378,19 +378,12 @@ class ProcessManager(object):
try:
# in case someone died while we were waiting...
self.check_children()
if not salt.utils.is_windows() and not async:
pid, exit_status = os.wait()
if pid not in self._process_map:
log.debug('Process of pid {0} died, not a known'
' process, will not restart'.format(pid))
continue
if self._restart_processes is True:
self.restart_process(pid)
elif async is True:
# The event-based subprocesses management code was removed from here
# because os.wait() conflicts with the subprocesses management logic
# implemented in `multiprocessing` package. See #35480 for details.
if async:
yield gen.sleep(10)
elif async is False:
# os.wait() is not supported on Windows.
else:
time.sleep(10)
# OSError is raised if a signal handler is called (SIGTERM) during os.wait
except OSError: