◐ Shell
reader mode source ↗
Skip to content

gh-104341: Call _PyEval_ReleaseLock() with NULL When Finalizing the Current Thread#105109

Merged
ericsnowcurrently merged 7 commits into
python:mainfrom
ericsnowcurrently:fix-threading-module-shutdown-3.12
Jun 1, 2023
Merged

gh-104341: Call _PyEval_ReleaseLock() with NULL When Finalizing the Current Thread#105109
ericsnowcurrently merged 7 commits into
python:mainfrom
ericsnowcurrently:fix-threading-module-shutdown-3.12

Conversation

@ericsnowcurrently

@ericsnowcurrently ericsnowcurrently commented May 30, 2023 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

This avoids the problematic race in drop_gil() by skipping the FORCE_SWITCHING code there for finalizing threads.

This is a much simpler approach to solving the race than in other PRs I've posted. I'd still like to pursue some of those other ideas but that can be done separately for 3.13+.

(The idea for this approach came out of discussions with @markshannon.)

@bedevere-bot bedevere-bot mentioned this pull request May 30, 2023
Closed
@ericsnowcurrently ericsnowcurrently marked this pull request as ready for review May 30, 2023 21:10
@ericsnowcurrently ericsnowcurrently mentioned this pull request May 31, 2023
Merged
@ericsnowcurrently

ericsnowcurrently commented Jun 1, 2023

Copy link
Copy Markdown
Member Author

@gpshead, @pitrou, do you have any objections to this PR at this point? I'd like to land this ASAP for beta 2. Thanks!

@gpshead

gpshead commented Jun 1, 2023

Copy link
Copy Markdown
Member

any objections to this PR at this point? I'd like to land this ASAP for beta 2. Thanks!

I think we're good to go: no objections from me. I never assume I can have full confidence about modifications to this code, but CI and buildbots and ultimately beta2 testing should reveal more if anything else lurks...

@ericsnowcurrently

ericsnowcurrently commented Jun 1, 2023

Copy link
Copy Markdown
Member Author

Thanks you!

@ericsnowcurrently ericsnowcurrently merged commit 3698fda into python:main Jun 1, 2023
@miss-islington

miss-islington commented Jun 1, 2023

Copy link
Copy Markdown
Contributor

Thanks @ericsnowcurrently for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington

miss-islington commented Jun 1, 2023

Copy link
Copy Markdown
Contributor

Sorry @ericsnowcurrently, I had trouble checking out the 3.12 backport branch.
Please retry by removing and re-adding the "needs backport to 3.12" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker 3698fda06eefb3c01e78c4c07f46fcdd0559e0f6 3.12

@ericsnowcurrently ericsnowcurrently deleted the fix-threading-module-shutdown-3.12 branch June 1, 2023 22:24
@ericsnowcurrently ericsnowcurrently added needs backport to 3.12 only security fixes and removed needs backport to 3.12 only security fixes labels Jun 1, 2023
@miss-islington

miss-islington commented Jun 1, 2023

Copy link
Copy Markdown
Contributor

Thanks @ericsnowcurrently for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 1, 2023
@ericsnowcurrently @miss-islington
pythongh-104341: Call _PyEval_ReleaseLock() with NULL When Finalizing… …
d7f46a8 
… the Current Thread (pythongh-105109)

This avoids the problematic race in drop_gil() by skipping the FORCE_SWITCHING code there for finalizing threads.

(The idea for this approach came out of discussions with @markshannon.)
(cherry picked from commit 3698fda)

Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
@bedevere-bot

bedevere-bot commented Jun 1, 2023

Copy link
Copy Markdown

GH-105209 is a backport of this pull request to the 3.12 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.12 only security fixes label Jun 1, 2023
ericsnowcurrently pushed a commit that referenced this pull request Jun 1, 2023
@miss-islington
[3.12] gh-104341: Call _PyEval_ReleaseLock() with NULL When Finalizin… …
d2be5c7 
…g the Current Thread (gh-105109) (gh-105209)

This avoids the problematic race in drop_gil() by skipping the FORCE_SWITCHING code there for finalizing threads.

(The idea for this approach came out of discussions with @markshannon.)
(cherry picked from commit 3698fda)

Co-authored-by: Eric Snow ericsnowcurrently@gmail.com
@erlend-aasland erlend-aasland mentioned this pull request Jun 6, 2023
Closed
@ericsnowcurrently ericsnowcurrently mentioned this pull request Oct 25, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pitrou pitrou pitrou left review comments

@gpshead gpshead gpshead approved these changes

@markshannon markshannon Awaiting requested review from markshannon

@tim-one tim-one Awaiting requested review from tim-one

@Yhg1s Yhg1s Awaiting requested review from Yhg1s

Assignees

@ericsnowcurrently ericsnowcurrently

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ericsnowcurrently @gpshead @miss-islington @bedevere-bot @pitrou