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

Fix SSLContext creation in the TCPConnector with multiple loops #9029

Merged
merged 15 commits into from
Sep 6, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Sep 5, 2024

Creation of the SSLContexts did not account for multiple event loops in different threads.

Creation is now done at import time to ensure it does not block the event loop.

fixes #9020

@bdraco bdraco added bot:chronographer:skip This PR does not need to include a change note backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Sep 5, 2024
@bdraco bdraco changed the title Add test coverage for using the TCPConnector with multiple loop Add test coverage for using the TCPConnector with multiple loops Sep 5, 2024
Copy link

codecov bot commented Sep 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.29%. Comparing base (e8d8e28) to head (bd44036).
Report is 1065 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9029      +/-   ##
==========================================
- Coverage   98.30%   98.29%   -0.01%     
==========================================
  Files         107      107              
  Lines       34355    34349       -6     
  Branches     4066     4071       +5     
==========================================
- Hits        33771    33765       -6     
  Misses        412      412              
  Partials      172      172              
Flag Coverage Δ
CI-GHA 98.19% <100.00%> (-0.01%) ⬇️
OS-Linux 97.85% <100.00%> (-0.01%) ⬇️
OS-Windows 96.26% <100.00%> (-0.01%) ⬇️
OS-macOS 97.53% <100.00%> (-0.01%) ⬇️
Py-3.10.11 97.63% <100.00%> (-0.01%) ⬇️
Py-3.10.14 97.56% <100.00%> (-0.01%) ⬇️
Py-3.11.9 97.79% <100.00%> (-0.01%) ⬇️
Py-3.12.5 97.91% <100.00%> (-0.01%) ⬇️
Py-3.9.13 97.51% <100.00%> (-0.01%) ⬇️
Py-3.9.19 97.45% <100.00%> (-0.01%) ⬇️
Py-pypy7.3.16 97.07% <100.00%> (-0.01%) ⬇️
VM-macos 97.53% <100.00%> (-0.01%) ⬇️
VM-ubuntu 97.85% <100.00%> (-0.01%) ⬇️
VM-windows 96.26% <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 Sep 5, 2024

Probably easier to fix the issue and include a test then try to suppress all the asyncio errors that pytest really wants to raise

@bdraco bdraco changed the title Add test coverage for using the TCPConnector with multiple loops Fix SSLContext creation in the TCPConnector with multiple loops Sep 5, 2024
@Dreamsorcerer
Copy link
Member

I'm not overly convinced we need to support multiple loops, but you didn't change the import_time test, so it can't be that slow to do this on import.

aiohttp/connector.py Outdated Show resolved Hide resolved
@bdraco
Copy link
Member Author

bdraco commented Sep 5, 2024

Need to check the missing coverage

@bdraco bdraco marked this pull request as ready for review September 6, 2024 19:08
@bdraco bdraco requested a review from asvetlov as a code owner September 6, 2024 19:08
@bdraco bdraco merged commit 466448c into master Sep 6, 2024
34 of 35 checks passed
@bdraco bdraco deleted the multi_loop_connectors branch September 6, 2024 19:08
Copy link
Contributor

patchback bot commented Sep 6, 2024

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

❌ Failed to cleanly apply 466448c on top of patchback/backports/3.10/466448c9412081e1928e08b8a3e413ef4faa1093/pr-9029

Backporting merged PR #9029 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/466448c9412081e1928e08b8a3e413ef4faa1093/pr-9029 upstream/3.10
  4. Now, cherry-pick PR Fix SSLContext creation in the TCPConnector with multiple loops #9029 contents into that branch:
    $ git cherry-pick -x 466448c9412081e1928e08b8a3e413ef4faa1093
    If it'll yell at you with something like fatal: Commit 466448c9412081e1928e08b8a3e413ef4faa1093 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 466448c9412081e1928e08b8a3e413ef4faa1093
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix SSLContext creation in the TCPConnector with multiple loops #9029 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.10/466448c9412081e1928e08b8a3e413ef4faa1093/pr-9029
  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.

Copy link
Contributor

patchback bot commented Sep 6, 2024

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

❌ Failed to cleanly apply 466448c on top of patchback/backports/3.11/466448c9412081e1928e08b8a3e413ef4faa1093/pr-9029

Backporting merged PR #9029 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/466448c9412081e1928e08b8a3e413ef4faa1093/pr-9029 upstream/3.11
  4. Now, cherry-pick PR Fix SSLContext creation in the TCPConnector with multiple loops #9029 contents into that branch:
    $ git cherry-pick -x 466448c9412081e1928e08b8a3e413ef4faa1093
    If it'll yell at you with something like fatal: Commit 466448c9412081e1928e08b8a3e413ef4faa1093 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 466448c9412081e1928e08b8a3e413ef4faa1093
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix SSLContext creation in the TCPConnector with multiple loops #9029 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/466448c9412081e1928e08b8a3e413ef4faa1093/pr-9029
  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
Copy link
Member Author

bdraco commented Sep 6, 2024

I'm not sure why I added skip on this one. I should have done a changelog message

@bdraco
Copy link
Member Author

bdraco commented Sep 6, 2024

I'll do another PR to add it #9044

bdraco added a commit that referenced this pull request Sep 6, 2024
bdraco added a commit that referenced this pull request Sep 6, 2024
bdraco added a commit that referenced this pull request Sep 6, 2024
bdraco added a commit that referenced this pull request Sep 6, 2024
bdraco added a commit that referenced this pull request Sep 6, 2024
patchback bot pushed a commit that referenced this pull request Sep 6, 2024
patchback bot pushed a commit that referenced this pull request Sep 6, 2024
bdraco added a commit that referenced this pull request Sep 6, 2024
 (#9049)

Co-authored-by: J. Nick Koston <nick@koston.org>
bdraco added a commit that referenced this pull request Sep 6, 2024
 (#9050)

Co-authored-by: J. Nick Koston <nick@koston.org>
bdraco added a commit that referenced this pull request Sep 6, 2024
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:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect re-use future in _make_or_get_ssl_context
2 participants