thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-04 13:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle corner case

Browse Source
This commit is contained in:
Dmitry Novik 2022-03-27 16:56:41 +00:00
parent 7b4281afa5
commit 95c9a03b9c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Common/OvercommitTracker.cpp
View File

@ -55,6 +55,12 @@ bool OvercommitTracker::needToStopQuery(MemoryTracker * tracker, Int64 amount)
{
return freed_momory >= required_memory || cancelation_state == QueryCancelationState::NONE;
});
// If query cancelation is still running, it's possible that other queries will reach
// hard limit and end up on waiting on condition variable.
// If so we need to specify that some part of freed memory is acquired at this moment.
if (!timeout && cancelation_state == QueryCancelationState::RUNNING)
freed_momory -= amount;
if (timeout)
LOG_DEBUG(getLogger(), "Need to stop query because reached waiting timeout");
else