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

Merge pull request #73128 from ClickHouse/backport/24.10/73081

Browse Source 
Backport #73081 to 24.10: Fix possible overestimate memory tracking
This commit is contained in:
Raúl Marín 2024-12-12 12:51:54 +01:00 committed by GitHub
commit dc1a8ecd92
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Common/ThreadStatus.cpp
View File

@ -206,8 +206,6 @@ bool ThreadStatus::isQueryCanceled() const
ThreadStatus::~ThreadStatus() ThreadStatus::~ThreadStatus()
{ {
flushUntrackedMemory();
/// It may cause segfault if query_context was destroyed, but was not detached /// It may cause segfault if query_context was destroyed, but was not detached
auto query_context_ptr = query_context.lock(); auto query_context_ptr = query_context.lock();
assert((!query_context_ptr && getQueryId().empty()) || (query_context_ptr && getQueryId() == query_context_ptr->getCurrentQueryId())); assert((!query_context_ptr && getQueryId().empty()) || (query_context_ptr && getQueryId() == query_context_ptr->getCurrentQueryId()));
@ -218,6 +216,9 @@ ThreadStatus::~ThreadStatus()
chassert(!check_current_thread_on_destruction || current_thread == this); chassert(!check_current_thread_on_destruction || current_thread == this);
/// Flush untracked_memory **right before** switching the current_thread to avoid losing untracked_memory in deleter (detachFromGroup)
flushUntrackedMemory();
/// Only change current_thread if it's currently being used by this ThreadStatus /// Only change current_thread if it's currently being used by this ThreadStatus
/// For example, PushingToViews chain creates and deletes ThreadStatus instances while running in the main query thread /// For example, PushingToViews chain creates and deletes ThreadStatus instances while running in the main query thread
if (current_thread == this) if (current_thread == this)