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.

Sign up for GitHub

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

Jump to bottom

gh-128759: fix data race in type_modified_unlocked #128764

Merged
merged 2 commits into from
Jan 13, 2025
Merged

gh-128759: fix data race in type_modified_unlocked #128764

merged 2 commits into from
Jan 13, 2025
+1 −1

Conversation

sobolevn
Copy link
Member

@sobolevn sobolevn commented Jan 12, 2025 •
edited by bedevere-app bot
Loading

@sobolevn sobolevn added skip news needs backport to 3.13 bugs and security fixes labels Jan 12, 2025
@sobolevn sobolevn requested a review from colesbury January 12, 2025 21:37
@sobolevn sobolevn requested a review from markshannon as a code owner January 12, 2025 21:37
@bedevere-app bedevere-app bot mentioned this pull request Jan 12, 2025
Open
colesbury
colesbury reviewed Jan 12, 2025
View reviewed changes
Objects/typeobject.c Outdated Show resolved Hide resolved
sobolevn
sobolevn commented Jan 12, 2025
View reviewed changes
Objects/typeobject.c Outdated Show resolved Hide resolved
colesbury
colesbury approved these changes Jan 12, 2025
View reviewed changes
Copy link
Contributor

@colesbury colesbury left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@sobolevn sobolevn enabled auto-merge (squash) January 12, 2025 23:36
@sobolevn
Copy link
Member Author

Is this related?

test_syslog_threaded (test.test_syslog.Test.test_syslog_threaded) ... Unable to join 11 threads during a period of 1 minutes
Unable to join 11 threads during a period of 2 minutes
Unable to join 11 threads during a period of 3 minutes
Unable to join 11 threads during a period of 4 minutes
Unable to join 11 threads during a period of 5 minutes
Unable to join 11 threads during a period of 6 minutes
Unable to join 11 threads during a period of 7 minutes
Unable to join 11 threads during a period of 8 minutes
Unable to join 11 threads during a period of 9 minutes
Timeout (0:10:00)!
Thread 0x0000ff6afda0f180 (most recent call first):
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/test_syslog.py", line 68 in logger
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 996 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1054 in _bootstrap_inner
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1016 in _bootstrap

Thread 0x0000ff6afec0f180 (most recent call first):
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/test_syslog.py", line 68 in logger
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 996 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1054 in _bootstrap_inner
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1016 in _bootstrap

Thread 0x0000ff6affe0f180 (most recent call first):
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/test_syslog.py", line 68 in logger
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 996 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1054 in _bootstrap_inner
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1016 in _bootstrap

Thread 0x0000ff6b09a0f180 (most recent call first):
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/test_syslog.py", line 68 in logger
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 996 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1054 in _bootstrap_inner
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1016 in _bootstrap

Thread 0x0000ff6b0ac0f180 (most recent call first):
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/test_syslog.py", line 68 in logger
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 996 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1054 in _bootstrap_inner
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1016 in _bootstrap

Thread 0x0000ff6b0be0f180 (most recent call first):
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/test_syslog.py", line 68 in logger
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 996 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1054 in _bootstrap_inner
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1016 in _bootstrap

Thread 0x0000ff6b15a0f180 (most recent call first):
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/test_syslog.py", line 68 in logger
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 996 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1054 in _bootstrap_inner
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1016 in _bootstrap

Thread 0x0000ff6b16c0f180 (most recent call first):
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/test_syslog.py", line 68 in logger
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 996 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1054 in _bootstrap_inner
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1016 in _bootstrap

Thread 0x0000ff6b17e0f180 (most recent call first):
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/test_syslog.py", line 68 in logger
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 996 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1054 in _bootstrap_inner
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1016 in _bootstrap

Thread 0x0000ff6b1d40f180 (most recent call first):
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/test_syslog.py", line 68 in logger
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 996 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1054 in _bootstrap_inner
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1016 in _bootstrap

Thread 0x0000ff6b1e60f180 (most recent call first):
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/test_syslog.py", line 63 in opener
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 996 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1054 in _bootstrap_inner
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1016 in _bootstrap

Thread 0x0000ff6b20134020 (most recent call first):
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/threading.py", line 1105 in join
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/support/threading_helper.py", line 147 in start_threads
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/contextlib.py", line 148 in __exit__
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/test_syslog.py", line 75 in test_syslog_threaded
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/unittest/case.py", line 606 in _callTestMethod
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/unittest/case.py", line 660 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/unittest/case.py", line 716 in __call__
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/unittest/suite.py", line 122 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/unittest/suite.py", line 84 in __call__
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/unittest/suite.py", line 122 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/unittest/suite.py", line 84 in __call__
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/unittest/runner.py", line 259 in run
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/libregrtest/single.py", line 58 in _run_suite
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/libregrtest/single.py", line 38 in run_unittest
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/libregrtest/single.py", line 136 in test_func
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/libregrtest/single.py", line 92 in regrtest_runner
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/libregrtest/single.py", line 139 in _load_run_test
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/libregrtest/single.py", line 184 in _runtest_env_changed_exc
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/libregrtest/single.py", line 284 in _runtest
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/libregrtest/single.py", line 313 in run_single_test
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/libregrtest/worker.py", line 83 in worker_process
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/libregrtest/worker.py", line 118 in main
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/test/libregrtest/worker.py", line 122 in <module>
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/runpy.py", line 88 in _run_code
  File "/home/runner/work/cpython/cpython-ro-srcdir/Lib/runpy.py", line 198 in _run_module_as_main
1 test failed again:
    test_syslog

https://github.com/python/cpython/actions/runs/12737988060/job/35499693991?pr=128764

@sobolevn sobolevn merged commit 6e1e780 into python:main Jan 13, 2025
43 checks passed
@miss-islington-app
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 13, 2025
@sobolevn @miss-islington
pythongh-128759: fix data race in type_modified_unlocked (pythonGH-…
acf7da9 
…128764)

(cherry picked from commit 6e1e780)

Co-authored-by: sobolevn <[email protected]>
@bedevere-app
Copy link

bedevere-app bot commented Jan 13, 2025

GH-128769 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Jan 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@colesbury colesbury colesbury approved these changes

@markshannon markshannon Awaiting requested review from markshannon markshannon is a code owner

Assignees
No one assigned
Labels
skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sobolevn @colesbury