Skip to content

Fix gunicorn endless restarting - #12879

Merged
Dreamsorcerer merged 3 commits into
masterfrom
fix-gunicorn
Jun 8, 2026
Merged

Fix gunicorn endless restarting#12879
Dreamsorcerer merged 3 commits into
masterfrom
fix-gunicorn

Conversation

@Dreamsorcerer

Copy link
Copy Markdown
Member

No description provided.

@Dreamsorcerer Dreamsorcerer added backport-3.14 Trigger automatic backporting to the 3.14 release branch by Patchback robot backport-3.15 Trigger automatic backporting to the 3.15 release branch by Patchback robot labels Jun 8, 2026
@psf-chronographer psf-chronographer Bot added the bot:chronographer:provided There is a change note present in this PR label Jun 8, 2026
@codecov

codecov Bot commented Jun 8, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.95%. Comparing base (d559f11) to head (8dfcf6a).
⚠️ Report is 6 commits behind head on master.
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #12879   +/-   ##
=======================================
  Coverage   98.95%   98.95%           
=======================================
  Files         131      131           
  Lines       47719    47736   +17     
  Branches     2475     2475           
=======================================
+ Hits        47219    47236   +17     
  Misses        376      376           
  Partials      124      124           
Flag Coverage Δ
Autobahn 22.26% <4.00%> (-0.01%) ⬇️
CI-GHA 98.92% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.68% <100.00%> (+<0.01%) ⬆️
OS-Windows 97.04% <0.00%> (-0.04%) ⬇️
OS-macOS 97.95% <100.00%> (+<0.01%) ⬆️
Py-3.10 98.17% <100.00%> (+<0.01%) ⬆️
Py-3.11 98.42% <100.00%> (+<0.01%) ⬆️
Py-3.12 98.51% <100.00%> (+<0.01%) ⬆️
Py-3.13 98.48% <100.00%> (+<0.01%) ⬆️
Py-3.14 98.50% <100.00%> (+<0.01%) ⬆️
Py-3.14t 97.58% <100.00%> (+<0.01%) ⬆️
Py-pypy-3.11 97.44% <100.00%> (-0.02%) ⬇️
VM-macos 97.95% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 98.68% <100.00%> (+<0.01%) ⬆️
VM-windows 97.04% <0.00%> (-0.04%) ⬇️
cython-coverage 38.12% <0.00%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

@codspeed-hq

codspeed-hq Bot commented Jun 8, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 72 untouched benchmarks
⏩ 72 skipped benchmarks1


Comparing fix-gunicorn (8dfcf6a) with master (86c33ba)2

Open in CodSpeed

Footnotes

  1. 72 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports.

  2. No successful run was found on master (e224676) during the generation of this report, so 86c33ba was used instead as the comparison base. There might be some changes unrelated to this pull request in this report.

@Dreamsorcerer

Copy link
Copy Markdown
Member Author

@timrid Flaky Android build failure, if you're interested: https://github.com/aio-libs/aiohttp/actions/runs/27165555501/job/80192336203?pr=12879
Not clear to me what actually failed.

@Dreamsorcerer
Dreamsorcerer merged commit e7d755d into master Jun 8, 2026
86 of 89 checks passed
@Dreamsorcerer
Dreamsorcerer deleted the fix-gunicorn branch June 8, 2026 21:43
@patchback

patchback Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

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

❌ Failed to cleanly apply e7d755d on top of patchback/backports/3.14/e7d755d9a7a6220114df1ed4f6a879d597b823dc/pr-12879

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

@patchback

patchback Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

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

❌ Failed to cleanly apply e7d755d on top of patchback/backports/3.15/e7d755d9a7a6220114df1ed4f6a879d597b823dc/pr-12879

Backporting merged PR #12879 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.15/e7d755d9a7a6220114df1ed4f6a879d597b823dc/pr-12879 upstream/3.15
  4. Now, cherry-pick PR Fix gunicorn endless restarting #12879 contents into that branch:
    $ git cherry-pick -x e7d755d9a7a6220114df1ed4f6a879d597b823dc
    If it'll yell at you with something like fatal: Commit e7d755d9a7a6220114df1ed4f6a879d597b823dc is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x e7d755d9a7a6220114df1ed4f6a879d597b823dc
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix gunicorn endless restarting #12879 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.15/e7d755d9a7a6220114df1ed4f6a879d597b823dc/pr-12879
  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 Jun 8, 2026
Dreamsorcerer added a commit that referenced this pull request Jun 8, 2026
tarasko pushed a commit to tarasko/aiohttp that referenced this pull request Jun 9, 2026
tarasko pushed a commit to tarasko/aiohttp that referenced this pull request Jun 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-3.14 Trigger automatic backporting to the 3.14 release branch by Patchback robot backport-3.15 Trigger automatic backporting to the 3.15 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