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 resolve_host "Task was destroyed but it is pending" errors #8967

Merged
merged 6 commits into from
Sep 2, 2024

Conversation

Dreamsorcerer
Copy link
Member

Fixes #7072.

@Dreamsorcerer Dreamsorcerer added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Sep 1, 2024
aiohttp/connector.py Outdated Show resolved Hide resolved
tests/test_connector.py Dismissed Show dismissed Hide dismissed
@Dreamsorcerer Dreamsorcerer mentioned this pull request Sep 1, 2024
1 task
aiohttp/connector.py Outdated Show resolved Hide resolved
Copy link

codecov bot commented Sep 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.28%. Comparing base (51fade1) to head (594b629).
Report is 1066 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #8967   +/-   ##
=======================================
  Coverage   98.28%   98.28%           
=======================================
  Files         107      107           
  Lines       34219    34246   +27     
  Branches     4057     4060    +3     
=======================================
+ Hits        33631    33658   +27     
  Misses        415      415           
  Partials      173      173           
Flag Coverage Δ
CI-GHA 98.17% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.83% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.24% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.51% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.61% <100.00%> (+<0.01%) ⬆️
Py-3.10.14 97.54% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.77% <100.00%> (+<0.01%) ⬆️
Py-3.12.5 97.89% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.50% <100.00%> (+<0.01%) ⬆️
Py-3.9.19 97.44% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.05% <100.00%> (+<0.01%) ⬆️
VM-macos 97.51% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 97.83% <100.00%> (+<0.01%) ⬆️
VM-windows 96.24% <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.

@Dreamsorcerer Dreamsorcerer added the bot:chronographer:skip This PR does not need to include a change note label Sep 2, 2024
@Dreamsorcerer Dreamsorcerer merged commit cd761a3 into master Sep 2, 2024
35 of 36 checks passed
@Dreamsorcerer Dreamsorcerer deleted the fix-gc-task branch September 2, 2024 00:16
Copy link
Contributor

patchback bot commented Sep 2, 2024

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

❌ Failed to cleanly apply cd761a3 on top of patchback/backports/3.10/cd761a347be2609deca503646b9b5fb3585b2fda/pr-8967

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

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

❌ Failed to cleanly apply cd761a3 on top of patchback/backports/3.11/cd761a347be2609deca503646b9b5fb3585b2fda/pr-8967

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

Dreamsorcerer added a commit that referenced this pull request Sep 2, 2024
Dreamsorcerer added a commit that referenced this pull request Sep 2, 2024
patchback bot pushed a commit that referenced this pull request Sep 2, 2024
Dreamsorcerer added a commit that referenced this pull request Sep 2, 2024
…ed but it is pending" errors (#8967) (#8984)

**This is a backport of PR #8980 as merged into 3.11
(ea31633).**

(cherry picked from commit cd761a3)

Co-authored-by: Sam Bull <[email protected]>
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.

Task was destroyed but it is pending! timeout
2 participants