Fix deadlock in OvercommitTracker #34591
Merged
Conversation
This file contains 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
robot-clickhouse
added
the
pr-not-for-changelog
novikd
changed the title
alesapin
reviewed
Feb 17, 2022
| @@ -8,10 +8,11 @@ using namespace std::chrono_literals; | |||
|
|
|||
| constexpr std::chrono::microseconds ZERO_MICROSEC = 0us; | |||
|
|
|||
| OvercommitTracker::OvercommitTracker() | |||
| OvercommitTracker::OvercommitTracker(std::mutex & global_mutex_) | |||
There was a problem hiding this comment.
global_mutex is unclear name -- what does it mean? We have a lot of "global" objects.
| @@ -22,13 +23,15 @@ void OvercommitTracker::setMaxWaitTime(UInt64 wait_time) | |||
|
|
|||
| bool OvercommitTracker::needToStopQuery(MemoryTracker * tracker) | |||
| { | |||
| std::unique_lock<std::mutex> global_lock(global_mutex); | |||
There was a problem hiding this comment.
Why we have to use this order? Need description.
| std::unique_lock<std::mutex> lk(overcommit_m); | ||
|
|
||
| if (max_wait_time == ZERO_MICROSEC) | ||
| return true; | ||
|
|
||
| pickQueryToExclude(); | ||
| assert(cancelation_state == QueryCancelationState::RUNNING); | ||
| global_lock.unlock(); |
There was a problem hiding this comment.
Why we unlocking here? Maybe it's ok to lock inside pickQueryToExclude?
| @@ -87,7 +87,7 @@ struct OvercommitTracker : boost::noncopyable | |||
| } | |||
| } | |||
|
|
|||
| friend struct BlockQueryIfMemoryLimit; | |||
| std::mutex & global_mutex; | |||
| @@ -127,29 +125,3 @@ struct GlobalOvercommitTracker : OvercommitTracker | |||
| DB::ProcessList * process_list; | |||
| Poco::Logger * logger = &Poco::Logger::get("GlobalOvercommitTracker"); | |||
| }; | |||
|
|
|||
There was a problem hiding this comment.
We don't need this anymore -- great!
| @@ -98,7 +98,7 @@ namespace DB | |||
|
|
|||
| struct UserOvercommitTracker : OvercommitTracker | |||
| { | |||
| explicit UserOvercommitTracker(DB::ProcessListForUser * user_process_list_); | |||
| explicit UserOvercommitTracker(DB::ProcessList * process_list, DB::ProcessListForUser * user_process_list_); | |||
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):