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

Avoid creating a future on every websocket receive #8498

Merged
merged 11 commits into from
Jul 14, 2024
Merged

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Jul 14, 2024

What do these changes do?

We should only create a future on close if we wait for the receive to finish. Instead of making the future every time receive is called, we should only create it when we are closing and let the close call await it only if receive is waiting. Since close is called far less frequently than receive in most cases, this is far more efficient.

There was also a nice decrease in set_result calls and a reduction of ~1000 future creations per minute on an HA install with 14 WebSocket connections open. Users with many WebSocket connections will see a much more substantial drop. WebSockets should scale better with this change, especially if they are highly active.

The future was added in ae38c4a , and the test_concurrent_close tests still pass with only creating the future on close

Are there changes in behavior for the user?

no

Is it a substantial burden for the maintainers to support this?

no

Related issue number

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES/ folder
    • name it <issue_or_pr_num>.<type>.rst (e.g. 588.bugfix.rst)

    • if you don't have an issue number, change it to the pull request
      number after creating the PR

      • .bugfix: A bug fix for something the maintainers deemed an
        improper undesired behavior that got corrected to match
        pre-agreed expectations.
      • .feature: A new behavior, public APIs. That sort of stuff.
      • .deprecation: A declaration of future API removals and breaking
        changes in behavior.
      • .breaking: When something public is removed in a breaking way.
        Could be deprecated in an earlier release.
      • .doc: Notable updates to the documentation structure or build
        process.
      • .packaging: Notes for downstreams about unobvious side effects
        and tooling. Changes in the test invocation considerations and
        runtime assumptions.
      • .contrib: Stuff that affects the contributor experience. e.g.
        Running tests, building the docs, setting up the development
        environment.
      • .misc: Changes that are hard to assign to any of the above
        categories.
    • Make sure to use full sentences with correct case and punctuation,
      for example:

      Fixed issue with non-ascii contents in doctest text files
      -- by :user:`contributor-gh-handle`.

      Use the past tense or the present tense a non-imperative mood,
      referring to what's changed compared to the last released version
      of this project.

aiohttp/web_ws.py Dismissed Show dismissed Hide dismissed
Only create a future on close if we need to wait
for the receive to finish
Copy link

codecov bot commented Jul 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.61%. Comparing base (c086795) to head (fa9b820).
Report is 918 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #8498   +/-   ##
=======================================
  Coverage   97.61%   97.61%           
=======================================
  Files         107      107           
  Lines       33104    33159   +55     
  Branches     3892     3895    +3     
=======================================
+ Hits        32314    32369   +55     
  Misses        571      571           
  Partials      219      219           
Flag Coverage Δ
CI-GHA 97.53% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.19% <100.00%> (+<0.01%) ⬆️
OS-Windows 95.65% <100.00%> (+<0.01%) ⬆️
OS-macOS 96.86% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.00% <100.00%> (-0.01%) ⬇️
Py-3.10.14 96.95% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.17% <100.00%> (+<0.01%) ⬆️
Py-3.12.4 97.30% <100.00%> (+<0.01%) ⬆️
Py-3.8.10 95.42% <100.00%> (+<0.01%) ⬆️
Py-3.8.18 96.84% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 96.99% <100.00%> (+<0.01%) ⬆️
Py-3.9.19 96.95% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 96.52% <100.00%> (+<0.01%) ⬆️
VM-macos 96.86% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 97.19% <100.00%> (+<0.01%) ⬆️
VM-windows 95.65% <100.00%> (+<0.01%) ⬆️

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.

@bdraco
Copy link
Member Author

bdraco commented Jul 14, 2024

I think this needs a test where concurrent tasks close the connection at the same time before receive is done in another task

tests/test_web_websocket_functional.py Dismissed Show dismissed Hide dismissed
tests/test_web_websocket_functional.py Dismissed Show dismissed Hide dismissed
app = web.Application()
app.router.add_route("GET", "/", handler)
client = await aiohttp_client(app)
ws = client_ws = await client.ws_connect("/")

Check notice

Code scanning / CodeQL

Unused local variable Note test

Variable client_ws is not used.
tests/test_client_ws_functional.py Dismissed Show dismissed Hide dismissed
tests/test_client_ws_functional.py Dismissed Show dismissed Hide dismissed
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Jul 14, 2024


async def test_concurrent_close_multiple_tasks(aiohttp_client: Any) -> None:
client_ws = None

Check notice

Code scanning / CodeQL

Unused local variable Note test

Variable client_ws is not used.
tests/test_client_ws_functional.py Dismissed Show dismissed Hide dismissed
tests/test_client_ws_functional.py Dismissed Show dismissed Hide dismissed
aiohttp/client_ws.py Outdated Show resolved Hide resolved
Co-authored-by: Sam Bull <git@sambull.org>
aiohttp/web_ws.py Outdated Show resolved Hide resolved
@bdraco
Copy link
Member Author

bdraco commented Jul 14, 2024

thanks

@bdraco bdraco marked this pull request as ready for review July 14, 2024 17:01
@bdraco bdraco requested review from webknjaz and asvetlov as code owners July 14, 2024 17:01
@bdraco bdraco merged commit 7bf6ee1 into master Jul 14, 2024
37 of 38 checks passed
@bdraco bdraco deleted the ws_recv_pref branch July 14, 2024 17:01
Copy link
Contributor

patchback bot commented Jul 14, 2024

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

❌ Failed to cleanly apply 7bf6ee1 on top of patchback/backports/3.10/7bf6ee1719e8b98d4aa9c7578ed016123ee888d9/pr-8498

Backporting merged PR #8498 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.10/7bf6ee1719e8b98d4aa9c7578ed016123ee888d9/pr-8498 upstream/3.10
  4. Now, cherry-pick PR Avoid creating a future on every websocket receive #8498 contents into that branch:
    $ git cherry-pick -x 7bf6ee1719e8b98d4aa9c7578ed016123ee888d9
    If it'll yell at you with something like fatal: Commit 7bf6ee1719e8b98d4aa9c7578ed016123ee888d9 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 7bf6ee1719e8b98d4aa9c7578ed016123ee888d9
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Avoid creating a future on every websocket receive #8498 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/7bf6ee1719e8b98d4aa9c7578ed016123ee888d9/pr-8498
  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 Jul 14, 2024
Co-authored-by: Sam Bull <git@sambull.org>
(cherry picked from commit 7bf6ee1)
bdraco added a commit that referenced this pull request Jul 14, 2024
…bsocket receive (#8503)

Co-authored-by: Sam Bull <git@sambull.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

2 participants