hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-18 15:33:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid zombie processes in case of using LocalProcessSpawner

Browse Source
This commit is contained in:
Maxim Martynov
2021-07-20 00:48:15 +03:00
parent e38509ca42
commit 9975b8001f
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jupyterhub/proxy.py
View File

@@ -722,8 +722,9 @@ class ConfigurableHTTPProxy(Proxy):
def _check_process(): def _check_process():
status = self.proxy_process.poll() status = self.proxy_process.poll()
if status is not None: if status is not None:
e = RuntimeError("Proxy failed to start with exit code %i" % status) with self.proxy_process:
raise e from None e = RuntimeError("Proxy failed to start with exit code %i" % status)
raise e from None
for server in (public_server, api_server): for server in (public_server, api_server):
for i in range(10): for i in range(10):

7
jupyterhub/spawner.py
View File

@@ -1542,8 +1542,11 @@ class LocalProcessSpawner(Spawner):
if self.proc is not None: if self.proc is not None:
status = self.proc.poll() status = self.proc.poll()
if status is not None: if status is not None:
# clear state if the process is done # handle SIGCHILD to avoid zombie processes
self.clear_state() # and also close stdout/stderr file descriptors
with self.proc:
# clear state if the process is done
self.clear_state()
return status return status
# if we resumed from stored state, # if we resumed from stored state,