Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

GH-96827: Don't touch closed loops from executor threads (#96837) 

* When chaining futures, skip callback if loop closed.
* When shutting down an executor, don't wake a closed loop.
This commit is contained in:
Guido van Rossum 2022-09-30 12:55:40 -07:00 committed by GitHub
parent b05dd79649
commit e9d63760fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/asyncio/base_events.py
View File

@ -588,9 +588,11 @@ class BaseEventLoop(events.AbstractEventLoop):
def _do_shutdown(self, future): def _do_shutdown(self, future):
try: try:
self._default_executor.shutdown(wait=True) self._default_executor.shutdown(wait=True)
self.call_soon_threadsafe(future.set_result, None) if not self.is_closed():
self.call_soon_threadsafe(future.set_result, None)
except Exception as ex: except Exception as ex:
self.call_soon_threadsafe(future.set_exception, ex) if not self.is_closed():
self.call_soon_threadsafe(future.set_exception, ex)
def _check_running(self): def _check_running(self):
if self.is_running(): if self.is_running():

2
Lib/asyncio/futures.py
View File

@ -404,6 +404,8 @@ def _chain_future(source, destination):
if dest_loop is None or dest_loop is source_loop: if dest_loop is None or dest_loop is source_loop:
_set_state(destination, source) _set_state(destination, source)
else: else:
if dest_loop.is_closed():
return
dest_loop.call_soon_threadsafe(_set_state, destination, source) dest_loop.call_soon_threadsafe(_set_state, destination, source)
destination.add_done_callback(_call_check_cancel) destination.add_done_callback(_call_check_cancel)

1
Misc/NEWS.d/next/Library/2022-09-30-15-56-20.gh-issue-96827.lzy1iw.rst Normal file
View File

@ -0,0 +1 @@
Avoid spurious tracebacks from :mod:`asyncio` when default executor cleanup is delayed until after the event loop is closed (e.g. as the result of a keyboard interrupt).