Fix deadlock with CancellationChecker#84203
Merged
antonio2368 merged 2 commits intomasterfrom Jul 28, 2025
Merged
Conversation
antonio2368
commented
Jul 22, 2025
| if (!tasks_to_cancel.empty()) | ||
| { | ||
| lock.unlock(); | ||
| std::ranges::for_each(tasks_to_cancel, cancelTask); |
Member
Author
There was a problem hiding this comment.
here is the fix, we cancel tasks without lock
Contributor
|
Workflow [PR], commit [c90cc4e] Summary: ❌
|
antonio2368
commented
Jul 22, 2025
yariks5s
approved these changes
Jul 24, 2025
This was referenced Jul 28, 2025
robot-ch-test-poll4
added a commit
that referenced
this pull request
Jul 28, 2025
Cherry pick #84203 to 25.7: Fix deadlock with CancellationChecker
robot-clickhouse
added a commit
that referenced
this pull request
Jul 28, 2025
robot-ch-test-poll
added a commit
that referenced
this pull request
Jul 28, 2025
Cherry pick #84203 to 25.3: Fix deadlock with CancellationChecker
robot-clickhouse
added a commit
that referenced
this pull request
Jul 28, 2025
robot-ch-test-poll
added a commit
that referenced
this pull request
Jul 28, 2025
Cherry pick #84203 to 25.5: Fix deadlock with CancellationChecker
robot-clickhouse
added a commit
that referenced
this pull request
Jul 28, 2025
robot-ch-test-poll
added a commit
that referenced
this pull request
Jul 28, 2025
Cherry pick #84203 to 25.6: Fix deadlock with CancellationChecker
robot-clickhouse
added a commit
that referenced
this pull request
Jul 28, 2025
clickhouse-gh bot
added a commit
that referenced
this pull request
Jul 28, 2025
Backport #84203 to 25.6: Fix deadlock with CancellationChecker
antonio2368
added a commit
that referenced
this pull request
Jul 29, 2025
Backport #84203 to 25.7: Fix deadlock with CancellationChecker
antonio2368
added a commit
that referenced
this pull request
Aug 11, 2025
Backport #84203 to 25.3: Fix deadlock with CancellationChecker
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes into CHANGELOG.md):
Fix deadlock caused by background cancellation checker thread.
Deadlock can happen in following situation:
T1:
ProcessListEntryin its destructor takesProcessList::mutexand wants to mark task as done inCancellationCheckerbutCancellationChecker::mutexis taken by T2.T2:
CancellationChecker::workerFunctiontookCancellationChecker::mutexand started cancelling tasks. Cancellation waits onExecutingGraph::mutexto cancel the task but it's taken by T3.T3:
ExecutingGraph::cancelwas called and it tookExecutingGraph::mutex. Inside cancel, OverCommitTracker is triggered which tries to takeProcessList::mutexbut it's already taken by T1.Documentation entry for user-facing changes