Skip to content

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

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 15 commits into from
Mar 18, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
15 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
6a524cb
Wait for test client to fully connect
CendioOssman Mar 12, 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
Prev Previous commit
Next Next commit
Even more deterministic 
No possibly infinite loop. Instead ask the system how much buffer space
it has and fill that.
  • Loading branch information
@CendioOssman
CendioOssman committed Mar 5, 2024
commit 1158151d212afb03c0ab58f267b67178a2158454
13 changes: 8 additions & 5 deletions Lib/test/test_asyncio/test_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,11 @@ async def serve(rd, wr):
(c_rd, c_wr) = await asyncio.open_connection(addr[0], addr[1], limit=4096)
self.addCleanup(c_wr.close)

# Limit the send buffer so we can reliably overfill it
# Limit the socket buffers so we can reliably overfill them
s_sock = s_wr.get_extra_info('socket')
s_sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 65536)
c_sock = c_wr.get_extra_info('socket')
c_sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 65536)

# Get the reader in to a paused state by sending more than twice
# the configured limit
Expand All @@ -240,10 +242,11 @@ async def serve(rd, wr):
await asyncio.sleep(0)

# Get the writer in a waiting state by sending data until the
# kernel stops accepting more in to the send buffer
while s_wr.transport.get_write_buffer_size() == 0:
s_wr.write(b'a' * 4096)
await asyncio.sleep(0)
# socket buffers are full on both server and client sockets and
# the kernel stops accepting more data
s_wr.write(b'a' * c_sock.getsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF))
s_wr.write(b'a' * s_sock.getsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF))
self.assertNotEqual(s_wr.transport.get_write_buffer_size(), 0)

task = asyncio.create_task(srv.wait_closed())
await asyncio.sleep(0)
Expand Down