Skip to content

gh-113538: Allow client connections to be closed #114432

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
gvanrossum merged 14 commits into from
Mar 11, 2024
Merged

gh-113538: Allow client connections to be closed #114432

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9f0111e
Don't use internals for wait_closed() tests
CendioOssman Jan 22, 2024
c25eabb
gh-113538: Allow client connections to be closed
CendioOssman Jan 22, 2024
b7fa198
Fix method references in new documentation
CendioOssman Jan 22, 2024
b3cd9c1
Add attribution
CendioOssman Jan 23, 2024
c78a927
Only keep a weak client references
CendioOssman Feb 2, 2024
1ec06da
Inform server of fallback transport cleanup
CendioOssman Feb 2, 2024
2790ddf
Clarify recomended order of methods
CendioOssman Feb 19, 2024
6a56a80
Fix typos
CendioOssman Feb 19, 2024
6929888
Use discard() instead of conditional remove()
CendioOssman Feb 19, 2024
8316199
Improve some comments
CendioOssman Feb 27, 2024
3e1705b
Do multiple sleeps to flush out callbacks
CendioOssman Feb 27, 2024
6c078d6
More deterministic abort_clients() test
CendioOssman Feb 27, 2024
1158151
Even more deterministic
CendioOssman Mar 5, 2024
1065dda
Merge branch 'main' of https://github.com/python/cpython into server_…
CendioOssman Mar 11, 2024
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
9 changes: 6 additions & 3 deletions Lib/asyncio/base_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,8 @@ def __init__(self, loop, sockets, protocol_factory, ssl_context, backlog,
ssl_handshake_timeout, ssl_shutdown_timeout=None):
self._loop = loop
self._sockets = sockets
self._clients = set()
# Weak references so abandoned transports can be detected

@gvanrossum gvanrossum Feb 19, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Weak references so abandoned transports can be detected
# Weak references so abandoned transports can be ignored

@CendioOssman CendioOssman Feb 19, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The wording here was intentional. Weak references is to my knowledge the only way to detect abandoned objects. But it's not this code that does that detection, so I can understand the confusion. How about:

Weak references so we don't break Transport's ability to detect abandoned transports

?

@gvanrossum gvanrossum Feb 19, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, you're thinking from the POV of the transport, whose __del__ must be called to "detect" (i.e., warn about) that it was abandoned. I was thinking from the POV of the loop in close_clients(), where we want to ignore (not encounter) transports that have been closed already.

I'll make it your choice which wording to use.

self._clients = weakref.WeakSet()
self._waiters = []
self._protocol_factory = protocol_factory
self._backlog = backlog
Expand All @@ -295,8 +296,10 @@ def _attach(self, transport):
self._clients.add(transport)

def _detach(self, transport):
assert transport in self._clients
self._clients.remove(transport)
# Note that 'transport' may already be missing from
# self._clients if it has been garbage collected
if transport in self._clients:
self._clients.remove(transport)
Comment thread
CendioOssman marked this conversation as resolved.
Resolved
if len(self._clients) == 0 and self._sockets is None:
self._wakeup()

Expand Down
2 changes: 2 additions & 0 deletions Lib/asyncio/selector_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,8 @@ def __del__(self, _warn=warnings.warn):
if self._sock is not None:
_warn(f"unclosed transport {self!r}", ResourceWarning, source=self)
self._sock.close()
if self._server is not None:
self._server._detach(self)
Comment thread
CendioOssman marked this conversation as resolved.
Resolved

def _fatal_error(self, exc, message='Fatal error on transport'):
# Should be called from exception handler only.
Expand Down