Skip to content

Commit 33dd75a

Browse files
bpo-38356: Fix ThreadedChildWatcher thread leak in test_asyncio (GH-16552)
Motivation for this PR (comment from @vstinner in bpo issue): ``` Warning seen o AMD64 Ubuntu Shared 3.x buildbot: https://buildbot.python.org/all/GH-/builders/141/builds/2593 test_devnull_output (test.test_a=syncio.test_subprocess.SubprocessThreadedWatcherTests) ... Warning -- threading_cleanup() failed to cleanup 1 threads (count: 1, dangling: 2) ``` The following implementation details for the new method are TBD: 1) Public vs private 2) Inclusion in `close()` 3) Name 4) Coroutine vs subroutine method 5) *timeout* parameter If it's a private method, 3, 4, and 5 are significantly less important. I started with the most minimal implementation that fixes the dangling threads without modifying the regression tests, which I think is particularly important. I typically try to avoid directly modifying existing tests as much as possible unless it's necessary to do so. However, I am open to changing any part of this. https://bugs.python.org/issue38356 (cherry picked from commit 0ca7cc7) Co-authored-by: Kyle Stanley <[email protected]>
1 parent a240f05 commit 33dd75a

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

Lib/asyncio/unix_events.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,14 @@ def is_active(self):
12661266
return True
12671267

12681268
def close(self):
1269-
pass
1269+
self._join_threads()
1270+
1271+
def _join_threads(self):
1272+
"""Internal: Join all non-daemon threads"""
1273+
threads = [thread for thread in list(self._threads.values())
1274+
if thread.is_alive() and not thread.daemon]
1275+
for thread in threads:
1276+
thread.join()
12701277

12711278
def __enter__(self):
12721279
return self

0 commit comments

Comments
 (0)