Skip to content
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3006d6e
fix proactor error hang
graingert Aug 31, 2026
eb09595
gh-127057: Re-arm proactor datagram read loop after a recoverable OSE…
graingert Aug 31, 2026
8a50451
Merge branches 'fix-proactor-udp-connreset' and 'fix-proactor-error-h…
graingert Sep 1, 2026
f1c27aa
unignore error port unreachable in proactor
graingert Sep 1, 2026
60187dd
Merge branch 'main' into fix-proactor-error-hang
graingert Sep 4, 2026
d57cb23
fix DatagramTransport when errror_recieved calls sendto
graingert Sep 4, 2026
bb80478
Merge branch 'main' of github.com:python/cpython into fix-proactor-er…
graingert Sep 5, 2026
99dd5a1
Merge branch 'fix-proactor-error-hang' into unignore-error-port-unrea…
graingert Sep 5, 2026
bad71a2
Merge branch 'main' of github.com:python/cpython into unignore-error-…
graingert Sep 16, 2026
5c71eb7
Apply suggestion from @graingert
graingert Sep 16, 2026
08e2a39
remove test_datagram_write_error_resumes_paused_protocol_from_callback
graingert Sep 16, 2026
b6eb862
Apply suggestion from @graingert
graingert Sep 16, 2026
96e0119
Merge branch 'main' into unignore-error-port-unreachable-in-proactor
graingert Sep 18, 2026
8dc75b4
Merge branch 'main' into unignore-error-port-unreachable-in-proactor
graingert Sep 30, 2026
d426aa2
Merge branch 'main' into unignore-error-port-unreachable-in-proactor
graingert Oct 5, 2026
37f3e94
Merge branch 'main' into unignore-error-port-unreachable-in-proactor
graingert Oct 7, 2026
cccedb8
Merge branch 'main' into unignore-error-port-unreachable-in-proactor
graingert Oct 19, 2026
74d7f75
shorten news
graingert Oct 19, 2026
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
7 changes: 7 additions & 0 deletions Lib/asyncio/proactor_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,13 @@ def _loop_reading(self, fut=None):
self._loop.call_soon(self._loop_reading)
except OSError as exc:
self._protocol.error_received(exc)
if not self._closing and not self._conn_lost:
# Some errors are transient and recoverable, e.g. a
# ConnectionResetError raised synchronously by WSARecvFrom()
# from a stale ICMP port-unreachable notification on a UDP
# socket. Re-arm the read loop instead of leaving it dead
# (gh-127057).
self._loop.call_soon(self._loop_reading)
Comment thread
graingert marked this conversation as resolved.
Outdated
except exceptions.CancelledError:
if not self._closing:
raise
Expand Down
29 changes: 11 additions & 18 deletions Lib/asyncio/windows_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import _overlapped
import _winapi
import errno
from functools import partial
import math
import msvcrt
import socket
Expand Down Expand Up @@ -460,24 +459,20 @@ def finish_socket_func(trans, key, ov):
try:
return ov.getresult()
except OSError as exc:
# ERROR_PORT_UNREACHABLE is reported by WSARecvFrom when the
# same socket was previously used to send to an address that
# isn't listening (gh-91227). Surface it as a
# ConnectionResetError, like the other recoverable codes here,
# so it propagates to the caller the same way a plain
# socket.recvfrom() already does on SelectorEventLoop, instead
# of being silently swallowed.
if exc.winerror in (_overlapped.ERROR_NETNAME_DELETED,
_overlapped.ERROR_OPERATION_ABORTED):
_overlapped.ERROR_OPERATION_ABORTED,
_overlapped.ERROR_PORT_UNREACHABLE):
raise ConnectionResetError(*exc.args)
else:
raise

@classmethod
def _finish_recvfrom(cls, trans, key, ov, *, empty_result):
try:
return cls.finish_socket_func(trans, key, ov)
except OSError as exc:
# WSARecvFrom will report ERROR_PORT_UNREACHABLE when the same
# socket is used to send to an address that is not listening.
if exc.winerror == _overlapped.ERROR_PORT_UNREACHABLE:
return empty_result, None
else:
raise

def recv(self, conn, nbytes, flags=0):
self._register_with_iocp(conn)
ov = _overlapped.Overlapped(NULL)
Expand Down Expand Up @@ -512,8 +507,7 @@ def recvfrom(self, conn, nbytes, flags=0):
except BrokenPipeError:
return self._result((b'', None))

return self._register(ov, conn, partial(self._finish_recvfrom,
empty_result=b''))
return self._register(ov, conn, self.finish_socket_func)

def recvfrom_into(self, conn, buf, flags=0):
self._register_with_iocp(conn)
Expand All @@ -523,8 +517,7 @@ def recvfrom_into(self, conn, buf, flags=0):
except BrokenPipeError:
return self._result((0, None))

return self._register(ov, conn, partial(self._finish_recvfrom,
empty_result=0))
return self._register(ov, conn, self.finish_socket_func)

def sendto(self, conn, buf, flags=0, addr=None):
self._register_with_iocp(conn)
Expand Down
44 changes: 38 additions & 6 deletions Lib/test/test_asyncio/test_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -1523,9 +1523,18 @@ class Protocol(asyncio.DatagramProtocol):

_received_datagram = None

def connection_made(self, transport):
self.errors = []
self.error_received_event = loop.create_future()

def datagram_received(self, data, addr):
self._received_datagram.set_result(data)

def error_received(self, exc):
self.errors.append(exc)
if not self.error_received_event.done():
self.error_received_event.set_result(None)

async def wait_for_datagram_received(self):
self._received_datagram = loop.create_future()
result = await asyncio.wait_for(self._received_datagram, 10)
Expand Down Expand Up @@ -1580,10 +1589,19 @@ def create_socket():
protocol_1.wait_for_datagram_received()
), b'd')

if sys.platform == 'win32':
# The bad send to addr_3 should be surfaced to the protocol
# via error_received() instead of being silently dropped,
# while transport_1 keeps working as shown above.
loop.run_until_complete(
asyncio.wait_for(protocol_1.error_received_event, 10))
self.assertTrue(protocol_1.errors)
self.assertIsInstance(protocol_1.errors[0], ConnectionResetError)

transport_1.close()
transport_2.close()

def test_datagram_write_error_resumes_paused_protocol(self):
def _test_datagram_write_error_resumes_paused_protocol(self, first, second):
# See https://github.com/python/cpython/issues/156698: a
# datagram write error must not strand data left in the write
# buffer, nor leave a paused protocol paused forever.
Expand Down Expand Up @@ -1619,11 +1637,11 @@ def error_received(self, exc):
# anything is left in the write buffer.
transport.set_write_buffer_limits(0)

# The oversized datagram fails while it is in flight, and the
# normal datagram behind it is left queued -- queuing is also
# what trips pause_writing() at a high water mark of 0.
transport.sendto(b'\x00' * 70000, addr)
transport.sendto(b'queued', addr)
# The first sendto() may arm an in-flight write, so the second
# one can end up queued behind it; queuing is what trips
# pause_writing() at a high water mark of 0.
transport.sendto(first, addr)
transport.sendto(second, addr)

loop.run_until_complete(
asyncio.wait_for(protocol.error_received_event,
Expand All @@ -1643,6 +1661,20 @@ def error_received(self, exc):
transport.close()
test_utils.run_briefly(loop)

def test_datagram_write_error_resumes_paused_protocol_in_flight(self):
# oversized datagram fails while in flight; a normal datagram
# queued right behind it must not be stranded.
oversized = b'\x00' * 70000
self._test_datagram_write_error_resumes_paused_protocol(
oversized, b'queued')

def test_datagram_write_error_resumes_paused_protocol_from_callback(self):
# oversized datagram fails once it reaches the front of the
# buffer; the protocol must not stay paused forever.
oversized = b'\x00' * 70000
self._test_datagram_write_error_resumes_paused_protocol(
b'ok', oversized)

def test_datagram_write_error_reentrant_sendto(self):
# See https://github.com/python/cpython/issues/156698: an
# error_received() callback that sends more data synchronously
Expand Down
41 changes: 25 additions & 16 deletions Lib/test/test_asyncio/test_sock_lowlevel.py
Original file line number Diff line number Diff line change
Expand Up @@ -613,19 +613,10 @@ def test_create_connection_sock(self):

if sys.platform == 'win32':

class SelectEventLoopTests(BaseSockTestsMixin,
test_utils.TestCase):

def create_event_loop(self):
return asyncio.SelectorEventLoop()


class ProactorEventLoopTests(BaseSockTestsMixin,
test_utils.TestCase):

def create_event_loop(self):
return asyncio.ProactorEventLoop()

class _DatagramSendToNonListeningAddressMixin:
# Shared by SelectEventLoopTests and ProactorEventLoopTests so that
# sock_recvfrom()/sock_recvfrom_into() behave identically on both
# event loop implementations.

async def _basetest_datagram_send_to_non_listening_address(self,
recvfrom):
Expand All @@ -634,8 +625,9 @@ async def _basetest_datagram_send_to_non_listening_address(self,
# https://github.com/python/cpython/issues/88906
# https://bugs.python.org/issue47071
# https://bugs.python.org/issue44743
# The Proactor event loop would fail to receive datagram messages
# after sending a message to an address that wasn't listening.
# Sending a datagram to an address that isn't listening can
# surface as a ConnectionResetError on a later receive; the
# socket must still be usable afterwards.

def create_socket():
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
Expand Down Expand Up @@ -670,7 +662,8 @@ def create_socket():

# this should send to an address that isn't listening
await self.loop.sock_sendto(socket_1, b'c', addr_3)
self.assertEqual(await socket_1_recv_task, b'')
with self.assertRaises(ConnectionResetError):
await socket_1_recv_task
socket_1_recv_task = self.loop.create_task(recvfrom(socket_1))
await asyncio.sleep(0)

Expand Down Expand Up @@ -706,6 +699,22 @@ async def recvfrom_into(socket):
self._basetest_datagram_send_to_non_listening_address(
recvfrom_into))


class SelectEventLoopTests(_DatagramSendToNonListeningAddressMixin,
BaseSockTestsMixin,
test_utils.TestCase):

def create_event_loop(self):
return asyncio.SelectorEventLoop()


class ProactorEventLoopTests(_DatagramSendToNonListeningAddressMixin,
BaseSockTestsMixin,
test_utils.TestCase):

def create_event_loop(self):
return asyncio.ProactorEventLoop()

else:
import selectors

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Fix :class:`asyncio.ProactorEventLoop` UDP transports and sockets so
Comment thread
graingert marked this conversation as resolved.
Outdated
that ``ERROR_PORT_UNREACHABLE``/``WSAECONNRESET`` (reported when the
same socket was previously used to send to an address that isn't
listening) is surfaced as a :exc:`ConnectionResetError` instead of
being silently swallowed. Datagram transports now deliver it to the
protocol via :meth:`~asyncio.DatagramProtocol.error_received` and
re-arm the read loop, and :meth:`~asyncio.loop.sock_recvfrom` /
Comment thread
graingert marked this conversation as resolved.
Outdated
:meth:`~asyncio.loop.sock_recvfrom_into` now raise it, matching the
behaviour :class:`asyncio.SelectorEventLoop` already had. This
corrects the fix applied in gh-91227, which papered over the issue by
discarding the error.
Loading