diff options
| author | yonatanp <yonatan.perry@gmail.com> | 2023-03-16 04:44:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-16 04:44:52 (GMT) |
| commit | 2dc94634b50f0e5e207787e5ac1d56c68b22c3ae (patch) | |
| tree | 1ffdfc46379f076a08afafdb67951b992280e0b6 /Lib/test/test_concurrent_futures.py | |
| parent | a44553ea9f7745a1119148082edb1fb0372ac0e2 (diff) | |
| download | cpython-2dc94634b50f0e5e207787e5ac1d56c68b22c3ae.zip cpython-2dc94634b50f0e5e207787e5ac1d56c68b22c3ae.tar.gz cpython-2dc94634b50f0e5e207787e5ac1d56c68b22c3ae.tar.bz2 | |
gh-94440: Fix issue of ProcessPoolExecutor shutdown hanging (#94468)
Fix an issue of concurrent.futures ProcessPoolExecutor shutdown hanging.
Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
Diffstat (limited to 'Lib/test/test_concurrent_futures.py')
| -rw-r--r-- | Lib/test/test_concurrent_futures.py | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py index b3520ae..a20cb84 100644 --- a/Lib/test/test_concurrent_futures.py +++ b/Lib/test/test_concurrent_futures.py @@ -14,6 +14,7 @@ import logging from logging.handlers import QueueHandler import os import queue +import signal import sys import threading import time @@ -397,6 +398,33 @@ class ExecutorShutdownTest: self.assertFalse(err) self.assertEqual(out.strip(), b"apple") + def test_hang_gh94440(self): + """shutdown(wait=True) doesn't hang when a future was submitted and + quickly canceled right before shutdown. + + See https://github.com/python/cpython/issues/94440. + """ + if not hasattr(signal, 'alarm'): + raise unittest.SkipTest( + "Tested platform does not support the alarm signal") + + def timeout(_signum, _frame): + raise RuntimeError("timed out waiting for shutdown") + + kwargs = {} + if getattr(self, 'ctx', None): + kwargs['mp_context'] = self.get_context() + executor = self.executor_type(max_workers=1, **kwargs) + executor.submit(int).result() + old_handler = signal.signal(signal.SIGALRM, timeout) + try: + signal.alarm(5) + executor.submit(int).cancel() + executor.shutdown(wait=True) + finally: + signal.alarm(0) + signal.signal(signal.SIGALRM, old_handler) + class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase): def test_threads_terminate(self): |
