Skip to content

Commit 0ca7cc7

Browse files
aerosmiss-islington
authored andcommitted
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/#/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
1 parent d7c7add commit 0ca7cc7

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
@@ -1344,7 +1344,14 @@ def is_active(self):
13441344
return True
13451345

13461346
def close(self):
1347-
pass
1347+
self._join_threads()
1348+
1349+
def _join_threads(self):
1350+
"""Internal: Join all non-daemon threads"""
1351+
threads = [thread for thread in list(self._threads.values())
1352+
if thread.is_alive() and not thread.daemon]
1353+
for thread in threads:
1354+
thread.join()
13481355

13491356
def __enter__(self):
13501357
return self

0 commit comments

Comments
 (0)