Skip to content

bpo-31783: Fix a race condition creating workers during shutdown #13171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 28, 2019
Merged

bpo-31783: Fix a race condition creating workers during shutdown #13171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4222fd
bpo-31783: Fix a race condition while creating workers during interpr…
brianquinlan May 7, 2019
e1f0027
📜🤖 Added by blurb_it.
blurb-it[bot] May 7, 2019
217a5ff
Merge branch 'master' into shutdown-race
brianquinlan May 8, 2019
c1e6922
Merge branch 'master' into shutdown-race
brianquinlan Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Lib/concurrent/futures/thread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,14 @@

_threads_queues = weakref.WeakKeyDictionary()
_shutdown = False
# Lock that ensures that new workers are not created while the interpreter is
# shutting down. Must be held while mutating _threads_queues and _shutdown.
_global_shutdown_lock = threading.Lock()

def _python_exit():
global _shutdown
_shutdown = True
with _global_shutdown_lock:
_shutdown = True
items = list(_threads_queues.items())
for t, q in items:
q.put(None)
Expand Down Expand Up @@ -156,7 +160,7 @@ def __init__(self, max_workers=None, thread_name_prefix='',
self._initargs = initargs

def submit(self, fn, /, *args, **kwargs):
with self._shutdown_lock:
with self._shutdown_lock, _global_shutdown_lock:
if self._broken:
raise BrokenThreadPool(self._broken)

Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2019-05-07-19-25-55.bpo-31783.lgLo69.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix race condition in ThreadPoolExecutor when worker threads are created during interpreter shutdown.