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 AsyncResolver swallowing the error message #9451

Merged
merged 5 commits into from
Oct 10, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Oct 10, 2024

What do these changes do?

We would incorrectly create the OSError exception by passing the string as the first argument. The first argument of OSError is the errno. This meant that the message would end up in the wrong place.

https://docs.python.org/3/library/exceptions.html#OSError

Are there changes in behavior for the user?

proper errors

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

no

Related issue number

#9447

We would incorrectly create the `OSError` exception by passing
the string as the first argument. The first argument of `OSError`
is the errno. This meant that the message would end up in the wrong
place.

https://docs.python.org/3/library/exceptions.html#OSError
@bdraco
Copy link
Member Author

bdraco commented Oct 10, 2024

much better
aiohttp.client_exceptions.ClientConnectorError: Cannot connect to host xcheckonline.home-assistant.io:443 ssl:default [DNS server returned answer with no data]

instead of
aiohttp.client_exceptions.ClientConnectorError: Cannot connect to host xcheckonline.home-assistant.io:443 ssl:default [None]

@bdraco bdraco added backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Oct 10, 2024
@bdraco
Copy link
Member Author

bdraco commented Oct 10, 2024

needs a test

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Oct 10, 2024
@bdraco
Copy link
Member Author

bdraco commented Oct 10, 2024

We have fallback code for 3.11/3.10 that has the same problem.

@bdraco bdraco marked this pull request as ready for review October 10, 2024 13:56
@bdraco bdraco enabled auto-merge (squash) October 10, 2024 13:57
@bdraco
Copy link
Member Author

bdraco commented Oct 10, 2024

I'll do another PR for 3.11 to fix the fallback code as well

Copy link

codecov bot commented Oct 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.58%. Comparing base (93e87c2) to head (e946bdb).
Report is 1 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9451   +/-   ##
=======================================
  Coverage   98.58%   98.58%           
=======================================
  Files         107      107           
  Lines       35010    35026   +16     
  Branches     4145     4151    +6     
=======================================
+ Hits        34515    34531   +16     
  Misses        330      330           
  Partials      165      165           
Flag Coverage Δ
CI-GHA 98.46% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.13% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.52% <22.22%> (-0.04%) ⬇️
OS-macOS 97.82% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.69% <100.00%> (+<0.01%) ⬆️
Py-3.10.15 97.62% <100.00%> (+<0.01%) ⬆️
Py-3.11.10 97.69% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.78% <100.00%> (+0.01%) ⬆️
Py-3.12.7 98.18% <100.00%> (+<0.01%) ⬆️
Py-3.13.0 98.17% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.59% <100.00%> (+<0.01%) ⬆️
Py-3.9.20 97.52% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.15% <100.00%> (+<0.01%) ⬆️
VM-macos 97.82% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 98.13% <100.00%> (+<0.01%) ⬆️
VM-windows 96.52% <22.22%> (-0.04%) ⬇️

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 Oct 10, 2024

@bdraco bdraco merged commit 216e082 into master Oct 10, 2024
36 of 37 checks passed
@bdraco bdraco deleted the async_resolver_swallowing_error_message branch October 10, 2024 14:08
Copy link
Contributor

patchback bot commented Oct 10, 2024

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

❌ Failed to cleanly apply 216e082 on top of patchback/backports/3.10/216e082807d02fafaacca57fc883c86826b126d3/pr-9451

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

Copy link
Contributor

patchback bot commented Oct 10, 2024

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

❌ Failed to cleanly apply 216e082 on top of patchback/backports/3.11/216e082807d02fafaacca57fc883c86826b126d3/pr-9451

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

bdraco added a commit that referenced this pull request Oct 10, 2024
bdraco added a commit that referenced this pull request Oct 10, 2024
bdraco added a commit that referenced this pull request Oct 10, 2024
bdraco added a commit that referenced this pull request Oct 10, 2024
bdraco added a commit that referenced this pull request Oct 10, 2024
Same change as #9451 but for the query fallback code for older
versions of aiodns
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot 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.

1 participant