To: python-checkins@python.org Subject: bpo-41317: Remove reader on cancellation in asyncio.loop.sock_accept() (#21595) Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 https://github.com/python/cpython/commit/0dd98c2d00a75efbec19c2ed942923981bc... 6683 commit: 0dd98c2d00a75efbec19c2ed942923981bc06683 branch: master author: Alex Gr=C3=B6nholm <alex.gronholm@nextday.fi> committer: GitHub <noreply@github.com> date: 2020-07-23T12:45:08-07:00 summary: bpo-41317: Remove reader on cancellation in asyncio.loop.sock_accept() (#2159= 5) files: A Misc/NEWS.d/next/Library/2020-07-23-01-18-34.bpo-41317.O17Z6x.rst M Lib/asyncio/selector_events.py M Lib/test/test_asyncio/test_sock_lowlevel.py diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index 884a58f2ed650..8495a7901cd34 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -555,20 +555,19 @@ async def sock_accept(self, sock): if self._debug and sock.gettimeout() !=3D 0: raise ValueError("the socket must be non-blocking") fut =3D self.create_future() - self._sock_accept(fut, False, sock) + self._sock_accept(fut, sock) return await fut =20 - def _sock_accept(self, fut, registered, sock): + def _sock_accept(self, fut, sock): fd =3D sock.fileno() - if registered: - self.remove_reader(fd) - if fut.done(): - return try: conn, address =3D sock.accept() conn.setblocking(False) except (BlockingIOError, InterruptedError): - self.add_reader(fd, self._sock_accept, fut, True, sock) + self._ensure_fd_no_transport(fd) + handle =3D self._add_reader(fd, self._sock_accept, fut, sock) + fut.add_done_callback( + functools.partial(self._sock_read_done, fd, handle=3Dhandle)) except (SystemExit, KeyboardInterrupt): raise except BaseException as exc: diff --git a/Lib/test/test_asyncio/test_sock_lowlevel.py b/Lib/test/test_asyn= cio/test_sock_lowlevel.py index e339ee9a4fc49..d8a5df8ede1f8 100644 --- a/Lib/test/test_asyncio/test_sock_lowlevel.py +++ b/Lib/test/test_asyncio/test_sock_lowlevel.py @@ -415,6 +415,25 @@ def test_sock_accept(self): conn.close() listener.close() =20 + def test_cancel_sock_accept(self): + listener =3D socket.socket() + listener.setblocking(False) + listener.bind(('127.0.0.1', 0)) + listener.listen(1) + sockaddr =3D listener.getsockname() + f =3D asyncio.wait_for(self.loop.sock_accept(listener), 0.1) + with self.assertRaises(asyncio.TimeoutError): + self.loop.run_until_complete(f) + + listener.close() + client =3D socket.socket() + client.setblocking(False) + f =3D self.loop.sock_connect(client, sockaddr) + with self.assertRaises(ConnectionRefusedError): + self.loop.run_until_complete(f) + + client.close() + def test_create_connection_sock(self): with test_utils.run_test_server() as httpd: sock =3D None diff --git a/Misc/NEWS.d/next/Library/2020-07-23-01-18-34.bpo-41317.O17Z6x.rs= t b/Misc/NEWS.d/next/Library/2020-07-23-01-18-34.bpo-41317.O17Z6x.rst new file mode 100644 index 0000000000000..1af985e90e3e9 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-07-23-01-18-34.bpo-41317.O17Z6x.rst @@ -0,0 +1,2 @@ +Use add_done_callback() in asyncio.loop.sock_accept() to unsubscribe reader +early on cancellation.