From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Tue, 13 Mar 2018 09:10:57 +0000 (-0700) Subject: bpo-33056 FIX leaking fd in concurrent.futures.ProcessPoolExecutor (GH-6084) (#6092) X-Git-Tag: v3.7.0b3~66 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f216cbf9ab704da98146a25d57ff0e85aecb49da;p=python bpo-33056 FIX leaking fd in concurrent.futures.ProcessPoolExecutor (GH-6084) (#6092) (cherry picked from commit 095ee415cee41bf24c3a1108c23307e5baf168dd) Co-authored-by: Thomas Moreau --- diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py index aaa5151e01..63f22cfca3 100644 --- a/Lib/concurrent/futures/process.py +++ b/Lib/concurrent/futures/process.py @@ -78,11 +78,13 @@ _global_shutdown = False class _ThreadWakeup: - __slot__ = ["_state"] - def __init__(self): self._reader, self._writer = mp.Pipe(duplex=False) + def close(self): + self._writer.close() + self._reader.close() + def wakeup(self): self._writer.send_bytes(b"") @@ -654,6 +656,11 @@ class ProcessPoolExecutor(_base.Executor): self._call_queue = None self._result_queue = None self._processes = None + + if self._queue_management_thread_wakeup: + self._queue_management_thread_wakeup.close() + self._queue_management_thread_wakeup = None + shutdown.__doc__ = _base.Executor.shutdown.__doc__ atexit.register(_python_exit) diff --git a/Misc/NEWS.d/next/Library/2018-03-12-16-40-00.bpo-33056.lNN9Eh.rst b/Misc/NEWS.d/next/Library/2018-03-12-16-40-00.bpo-33056.lNN9Eh.rst new file mode 100644 index 0000000000..6acc19a36d --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-03-12-16-40-00.bpo-33056.lNN9Eh.rst @@ -0,0 +1 @@ +FIX properly close leaking fds in concurrent.futures.ProcessPoolExecutor.