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

Break cyclic references when there is an exception handling a request #10569

Merged
merged 6 commits into from
Mar 16, 2025

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Mar 16, 2025

What do these changes do?

fixes #10548

Are there changes in behavior for the user?

fixes a potential memory leak

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

no

This is a partial fix for #10548

There is still another case for SystemRoutes that needs to be addressed
@bdraco bdraco added backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot labels Mar 16, 2025
This is a partial fix for #10548

There is still another case for SystemRoutes that needs to be addressed
Copy link

codecov bot commented Mar 16, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.71%. Comparing base (9d4e116) to head (fc11e12).
Report is 1 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #10569   +/-   ##
=======================================
  Coverage   98.70%   98.71%           
=======================================
  Files         124      125    +1     
  Lines       37335    37367   +32     
  Branches     2063     2063           
=======================================
+ Hits        36850    36885   +35     
+ Misses        338      335    -3     
  Partials      147      147           
Flag Coverage Δ
CI-GHA 98.59% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.26% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.19% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.36% <100.00%> (-0.01%) ⬇️
Py-3.10.11 97.27% <100.00%> (+<0.01%) ⬆️
Py-3.10.16 97.82% <100.00%> (+<0.01%) ⬆️
Py-3.11.11 97.91% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.35% <100.00%> (+<0.01%) ⬆️
Py-3.12.9 98.35% <100.00%> (+<0.01%) ⬆️
Py-3.13.2 98.34% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.15% <100.00%> (+<0.01%) ⬆️
Py-3.9.21 97.69% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 85.31% <57.14%> (-1.30%) ⬇️
VM-macos 97.36% <100.00%> (-0.01%) ⬇️
VM-ubuntu 98.26% <100.00%> (+<0.01%) ⬆️
VM-windows 96.19% <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.

Copy link

codspeed-hq bot commented Mar 16, 2025

CodSpeed Performance Report

Merging #10569 will not alter performance

Comparing memory_leak_traceback (fc11e12) with master (9d4e116)

Summary

✅ 47 untouched benchmarks

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Mar 16, 2025
@bdraco bdraco marked this pull request as ready for review March 16, 2025 21:33
@bdraco bdraco merged commit dfbf782 into master Mar 16, 2025
41 checks passed
@bdraco bdraco deleted the memory_leak_traceback branch March 16, 2025 21:38
Copy link
Contributor

patchback bot commented Mar 16, 2025

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

❌ Failed to cleanly apply dfbf782 on top of patchback/backports/3.11/dfbf782ba4ea3eabfe052e6224727cf83efdffb5/pr-10569

Backporting merged PR #10569 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/dfbf782ba4ea3eabfe052e6224727cf83efdffb5/pr-10569 upstream/3.11
  4. Now, cherry-pick PR Break cyclic references when there is an exception handling a request #10569 contents into that branch:
    $ git cherry-pick -x dfbf782ba4ea3eabfe052e6224727cf83efdffb5
    If it'll yell at you with something like fatal: Commit dfbf782ba4ea3eabfe052e6224727cf83efdffb5 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x dfbf782ba4ea3eabfe052e6224727cf83efdffb5
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Break cyclic references when there is an exception handling a request #10569 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/dfbf782ba4ea3eabfe052e6224727cf83efdffb5/pr-10569
  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 Mar 16, 2025

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

❌ Failed to cleanly apply dfbf782 on top of patchback/backports/3.12/dfbf782ba4ea3eabfe052e6224727cf83efdffb5/pr-10569

Backporting merged PR #10569 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.12/dfbf782ba4ea3eabfe052e6224727cf83efdffb5/pr-10569 upstream/3.12
  4. Now, cherry-pick PR Break cyclic references when there is an exception handling a request #10569 contents into that branch:
    $ git cherry-pick -x dfbf782ba4ea3eabfe052e6224727cf83efdffb5
    If it'll yell at you with something like fatal: Commit dfbf782ba4ea3eabfe052e6224727cf83efdffb5 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x dfbf782ba4ea3eabfe052e6224727cf83efdffb5
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Break cyclic references when there is an exception handling a request #10569 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.12/dfbf782ba4ea3eabfe052e6224727cf83efdffb5/pr-10569
  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 bdraco added backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot and removed backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Mar 16, 2025
Copy link
Contributor

patchback bot commented Mar 16, 2025

Backport to 3.11: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.11/dfbf782ba4ea3eabfe052e6224727cf83efdffb5/pr-10569

Backported as #10571

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

@bdraco bdraco added the backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot label Mar 16, 2025
Copy link
Contributor

patchback bot commented Mar 16, 2025

Backport to 3.12: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.12/dfbf782ba4ea3eabfe052e6224727cf83efdffb5/pr-10569

Backported as #10572

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

patchback bot pushed a commit that referenced this pull request Mar 16, 2025
…#10569)

<!-- Thank you for your contribution! -->

## What do these changes do?

This is a partial fix for #10548

- There is still another case for `SystemRoute`s that needs to be
addressed. No reproducer available yet.
- There is also another case on the client side on connection refused
that still needs to be addressed
#10548 (comment)

## Are there changes in behavior for the user?

fixes memory leak

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

(cherry picked from commit dfbf782)
patchback bot pushed a commit that referenced this pull request Mar 16, 2025
…#10569)

<!-- Thank you for your contribution! -->

## What do these changes do?

This is a partial fix for #10548

- There is still another case for `SystemRoute`s that needs to be
addressed. No reproducer available yet.
- There is also another case on the client side on connection refused
that still needs to be addressed
#10548 (comment)

## Are there changes in behavior for the user?

fixes memory leak

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

(cherry picked from commit dfbf782)
bdraco added a commit that referenced this pull request Mar 16, 2025
…e is an exception handling a request (#10571)

**This is a backport of PR #10569 as merged into master
(dfbf782).**

<!-- Thank you for your contribution! -->

## What do these changes do?

This is a partial fix for #10548

- There is still another case for `SystemRoute`s that needs to be
addressed. No reproducer available yet.
- There is also another case on the client side on connection refused
that still needs to be addressed
#10548 (comment)

## Are there changes in behavior for the user?

fixes memory leak

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

Co-authored-by: J. Nick Koston <[email protected]>
bdraco added a commit that referenced this pull request Mar 16, 2025
…e is an exception handling a request (#10572)

**This is a backport of PR #10569 as merged into master
(dfbf782).**

<!-- Thank you for your contribution! -->

## What do these changes do?

fixes #10548

## Are there changes in behavior for the user?

fixes a potential memory leak

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

Co-authored-by: J. Nick Koston <[email protected]>
bdraco added a commit that referenced this pull request Mar 16, 2025
@bdraco bdraco mentioned this pull request Mar 16, 2025
bdraco added a commit that referenced this pull request Mar 16, 2025
Small cleanup to the leak tests
#10569 (comment)
patchback bot pushed a commit that referenced this pull request Mar 16, 2025
Small cleanup to the leak tests
#10569 (comment)

(cherry picked from commit 3c60cd2)
patchback bot pushed a commit that referenced this pull request Mar 16, 2025
Small cleanup to the leak tests
#10569 (comment)

(cherry picked from commit 3c60cd2)
bdraco added a commit that referenced this pull request Mar 16, 2025
**This is a backport of PR #10577 as merged into master
(3c60cd2).**



Small cleanup to the leak tests
#10569 (comment)

Co-authored-by: J. Nick Koston <[email protected]>
bdraco added a commit that referenced this pull request Mar 17, 2025
**This is a backport of PR #10577 as merged into master
(3c60cd2).**



Small cleanup to the leak tests
#10569 (comment)

Co-authored-by: J. Nick Koston <[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 backport-3.12 Trigger automatic backporting to the 3.12 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.

Memory Leak in web request due to cyclic reference
2 participants