Issue #12364: Fix a hang in concurrent.futures.ProcessPoolExecutor.

This commit is contained in:
Ross Lagerwall 2012-01-08 08:29:40 +02:00
parent 645a0dd6f7
commit 66e2fb68ac
3 changed files with 11 additions and 6 deletions

View file

@ -213,9 +213,7 @@ def _queue_management_worker(executor_reference,
work_item.future.set_exception(result_item.exception)
else:
work_item.future.set_result(result_item.result)
continue
# If we come here, we either got a timeout or were explicitly woken up.
# In either case, check whether we should start shutting down.
# Check whether we should start shutting down.
executor = executor_reference()
# No more work items can be added if:
# - The interpreter is shutting down OR
@ -234,9 +232,6 @@ def _queue_management_worker(executor_reference,
p.join()
call_queue.close()
return
else:
# Start shutting down by telling a process it can exit.
shutdown_one_process()
del executor
_system_limits_checked = False