diff options
| author | Ross Lagerwall <rosslagerwall@gmail.com> | 2012-01-08 06:42:03 (GMT) |
|---|---|---|
| committer | Ross Lagerwall <rosslagerwall@gmail.com> | 2012-01-08 06:42:03 (GMT) |
| commit | 69f39a53f62734d3e8dcb4bdcc217c4b3551d393 (patch) | |
| tree | 1baf6ceb8e888f0acd7a4c717f32bda2ecfab39f | |
| parent | 75404274344794012da83362f32b6e1786ef04df (diff) | |
| parent | 66e2fb68aca2a2678a327b200e657b761f358bc1 (diff) | |
| download | cpython-69f39a53f62734d3e8dcb4bdcc217c4b3551d393.zip cpython-69f39a53f62734d3e8dcb4bdcc217c4b3551d393.tar.gz cpython-69f39a53f62734d3e8dcb4bdcc217c4b3551d393.tar.bz2 | |
Merge with 3.2 for #12364.
| -rw-r--r-- | Lib/concurrent/futures/process.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_concurrent_futures.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py index 0575146..7f31ec2 100644 --- a/Lib/concurrent/futures/process.py +++ b/Lib/concurrent/futures/process.py @@ -273,9 +273,6 @@ def _queue_management_worker(executor_reference, if not pending_work_items: shutdown_worker() return - else: - # Start shutting down by telling a process it can exit. - call_queue.put_nowait(None) except Full: # This is not a problem: we will eventually be woken up (in # result_queue.get()) and be able to send a sentinel again. diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py index 7522a54..04ee246 100644 --- a/Lib/test/test_concurrent_futures.py +++ b/Lib/test/test_concurrent_futures.py @@ -109,6 +109,12 @@ class ExecutorShutdownTest(unittest.TestCase): self.assertFalse(err) self.assertEqual(out.strip(), b"apple") + def test_hang_issue12364(self): + fs = [self.executor.submit(time.sleep, 0.1) for _ in range(50)] + self.executor.shutdown() + for f in fs: + f.result() + class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest): def _prime_executor(self): @@ -422,6 +422,10 @@ Core and Builtins Library ------- +- Issue #12364: Fix a hang in concurrent.futures.ProcessPoolExecutor. + The hang would occur when retrieving the result of a scheduled future after + the executor had been shut down. + - Issue #13502: threading: Fix a race condition in Event.wait() that made it return False when the event was set and cleared right after. |