Skip to content
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.

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

Reuse the oldest keep-alive connection first #9672

Merged
merged 13 commits into from
Nov 5, 2024
Merged

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Nov 5, 2024

Previously we would reuse the newest one which meant as more and more connections were cycled the first one in the list became more and more stale until it was more likely to drop

Change the order from LIFO to FIFO

Previously we would reuse the newest one which meant as more
and more connections were cycled the first one in the
list became more and more stale until it was more likely
to drop
@bdraco bdraco added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Nov 5, 2024
Copy link

codspeed-hq bot commented Nov 5, 2024

CodSpeed Performance Report

Merging #9672 will not alter performance

Comparing connection_reuse_oldest (75169a6) with master (75ae623)

Summary

✅ 13 untouched benchmarks

Copy link

codecov bot commented Nov 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.66%. Comparing base (75ae623) to head (75169a6).
Report is 1 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9672   +/-   ##
=======================================
  Coverage   98.66%   98.66%           
=======================================
  Files         116      116           
  Lines       35638    35638           
  Branches     4225     4225           
=======================================
  Hits        35164    35164           
  Misses        319      319           
  Partials      155      155           
Flag Coverage Δ
CI-GHA 98.55% <100.00%> (ø)
OS-Linux 98.23% <100.00%> (ø)
OS-Windows 96.11% <100.00%> (ø)
OS-macOS 97.42% <100.00%> (-0.01%) ⬇️
Py-3.10.11 97.28% <100.00%> (+1.60%) ⬆️
Py-3.10.15 97.71% <100.00%> (ø)
Py-3.11.10 97.77% <100.00%> (ø)
Py-3.11.9 97.36% <100.00%> (-0.01%) ⬇️
Py-3.12.7 98.25% <100.00%> (ø)
Py-3.13.0 98.24% <100.00%> (ø)
Py-3.9.13 97.20% <100.00%> (+<0.01%) ⬆️
Py-3.9.20 97.62% <100.00%> (ø)
Py-pypy7.3.16 97.24% <97.61%> (-0.01%) ⬇️
VM-macos 97.42% <100.00%> (-0.01%) ⬇️
VM-ubuntu 98.23% <100.00%> (ø)
VM-windows 96.11% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Dreamsorcerer
Copy link
Member

Is it possible that's a deliberate decision to avoid keeping too many connections open? e.g. A quick burst opens up 3 connections, then going forward only 1 request is needed at a time, so the other 2 connections will get closed. Whereas this will stop connections from getting closed.

If you have evidence this approach is better, I'm fine with it. Just checking it's thought through (and maybe a comment added to the code to explain the design choice).

@bdraco
Copy link
Member Author

bdraco commented Nov 5, 2024

Is it possible that's a deliberate decision to avoid keeping too many connections open? e.g. A quick burst opens up 3 connections, then going forward only 1 request is needed at a time, so the other 2 connections will get closed. Whereas this will stop connections from getting closed.

If you have evidence this approach is better, I'm fine with it. Just checking it's thought through (and maybe a comment added to the code to explain the design choice).

My original thought was that it might make sense to reuse the newest one since its less likely to be closed, but it seems more connections get reused in production with the FIFO approach.

I still want to do more testing with this though before I move it forward. Since it conflicts with #9671 I've put it on the back burner as that one seems much more important to solve.

@asvetlov
Copy link
Member

asvetlov commented Nov 5, 2024

FIFO sounds like a good strategy for me.
I don't recall the reason for implementing LIFO.
It sits in the code from the very beginning.
I suspect it was added by accident.

@bdraco
Copy link
Member Author

bdraco commented Nov 5, 2024

78% connection reuse before
84% connection reuse after

@bdraco
Copy link
Member Author

bdraco commented Nov 5, 2024

On another system where there is more /10s polling

73% before
86% after

@bdraco
Copy link
Member Author

bdraco commented Nov 5, 2024

So its a little bit more likely to reuse a connection. YMMV based on the server keep alive timeout.

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Nov 5, 2024
CHANGES/9672.bugfix.rst Outdated Show resolved Hide resolved
@bdraco bdraco marked this pull request as ready for review November 5, 2024 18:28
@bdraco bdraco requested a review from webknjaz as a code owner November 5, 2024 18:28
@bdraco bdraco requested a review from asvetlov as a code owner November 5, 2024 18:28
@bdraco bdraco enabled auto-merge (squash) November 5, 2024 18:41
@bdraco bdraco merged commit afb5ebb into master Nov 5, 2024
37 of 38 checks passed
@bdraco bdraco deleted the connection_reuse_oldest branch November 5, 2024 18:44
Copy link
Contributor

patchback bot commented Nov 5, 2024

Backport to 3.11: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply afb5ebb on top of patchback/backports/3.11/afb5ebb912ebe1cf88e0d2c19d5f240ffb0b72ee/pr-9672

Backporting merged PR #9672 into master

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/aio-libs/aiohttp.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/3.11/afb5ebb912ebe1cf88e0d2c19d5f240ffb0b72ee/pr-9672 upstream/3.11
  4. Now, cherry-pick PR Reuse the oldest keep-alive connection first #9672 contents into that branch:
    $ git cherry-pick -x afb5ebb912ebe1cf88e0d2c19d5f240ffb0b72ee
    If it'll yell at you with something like fatal: Commit afb5ebb912ebe1cf88e0d2c19d5f240ffb0b72ee is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x afb5ebb912ebe1cf88e0d2c19d5f240ffb0b72ee
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Reuse the oldest keep-alive connection first #9672 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/afb5ebb912ebe1cf88e0d2c19d5f240ffb0b72ee/pr-9672
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

bdraco added a commit that referenced this pull request Nov 5, 2024
bdraco added a commit that referenced this pull request Nov 5, 2024
@Olegt0rr
Copy link
Contributor

Olegt0rr commented Nov 8, 2024

On another system where there is more /10s polling

73% before 86% after

@bdraco,
Could you share your code snippet to reproduce this measurement?
Wanna try it on my environment
Thanks :)

@bdraco
Copy link
Member Author

bdraco commented Nov 8, 2024

On another system where there is more /10s polling

73% before 86% after

@bdraco,

Could you share your code snippet to reproduce this measurement?

Wanna try it on my environment

Thanks :)

Sorry there is no snippet. I was profiling a few different Home Assistant instances to gauge the effect with a real world use case.

@bdraco
Copy link
Member Author

bdraco commented Nov 8, 2024

The change is available in the 3.11.0 betas if you would like to give it a test

@bdraco
Copy link
Member Author

bdraco commented Nov 8, 2024

If you do a callgrind, look at the number of __aenter__ calls from from connect. That will tell you how many didn't get reused

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants