Merge pull request #34663 from ClickHouse/disable-overcommit

Disable memory overcommit if timeout is not set
This commit is contained in:
alesapin 2022-02-17 11:31:17 +03:00 committed by GitHub
commit 5343b7dcbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,8 +6,10 @@
using namespace std::chrono_literals;
constexpr std::chrono::microseconds ZERO_MICROSEC = 0us;
OvercommitTracker::OvercommitTracker()
: max_wait_time(0us)
: max_wait_time(ZERO_MICROSEC)
, picked_tracker(nullptr)
, cancelation_state(QueryCancelationState::NONE)
{}
@ -22,6 +24,9 @@ bool OvercommitTracker::needToStopQuery(MemoryTracker * tracker)
{
std::unique_lock<std::mutex> lk(overcommit_m);
if (max_wait_time == ZERO_MICROSEC)
return true;
pickQueryToExclude();
assert(cancelation_state == QueryCancelationState::RUNNING);