Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion be/src/olap/page_cache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ PageBase<TAllocator>::PageBase(size_t b, bool use_cache, segment_v2::PageTypePB
if (use_cache) {
_mem_tracker_by_allocator = StoragePageCache::instance()->mem_tracker(page_type);
} else {
_mem_tracker_by_allocator = thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker();
_mem_tracker_by_allocator =
thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker_sptr();
}
{
SCOPED_SWITCH_THREAD_MEM_TRACKER_LIMITER(_mem_tracker_by_allocator);
Expand Down
8 changes: 5 additions & 3 deletions be/src/runtime/memory/thread_mem_tracker_mgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,13 @@ void ThreadMemTrackerMgr::attach_limiter_tracker(
// _untracked_mem temporary store bytes that not synchronized to process reserved memory,
// but bytes have been subtracted from thread _reserved_mem.
doris::GlobalMemoryArbitrator::release_process_reserved_memory(_untracked_mem);
_limiter_tracker->release_reserved(_untracked_mem);
_limiter_tracker_sptr->release_reserved(_untracked_mem);
_reserved_mem = 0;
_untracked_mem = 0;
}
_consumer_tracker_stack.clear();
_limiter_tracker = mem_tracker;
_limiter_tracker_sptr = mem_tracker;
_limiter_tracker = _limiter_tracker_sptr.get();
}

void ThreadMemTrackerMgr::detach_limiter_tracker(
Expand All @@ -68,7 +69,8 @@ void ThreadMemTrackerMgr::detach_limiter_tracker(
_reserved_mem = _last_attach_snapshots_stack.back().reserved_mem;
_consumer_tracker_stack = _last_attach_snapshots_stack.back().consumer_tracker_stack;
_last_attach_snapshots_stack.pop_back();
_limiter_tracker = old_mem_tracker;
_limiter_tracker_sptr = old_mem_tracker;
_limiter_tracker = _limiter_tracker_sptr.get();
}

void ThreadMemTrackerMgr::cancel_query(const std::string& exceed_msg) {
Expand Down
16 changes: 13 additions & 3 deletions be/src/runtime/memory/thread_mem_tracker_mgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,19 @@ class ThreadMemTrackerMgr {

void reset_query_cancelled_flag(bool new_val) { _is_query_cancelled = new_val; }

std::shared_ptr<MemTrackerLimiter> limiter_mem_tracker() {
MemTrackerLimiter* limiter_mem_tracker() {
CHECK(init());
return _limiter_tracker;
}

// Prefer use `limiter_mem_tracker`, which is faster than `limiter_mem_tracker_sptr`.
// when multiple threads hold the same `std::shared_ptr` at the same time,
// modifying the `std::shared_ptr` reference count will be expensive when there is high concurrency.
std::shared_ptr<MemTrackerLimiter> limiter_mem_tracker_sptr() {
CHECK(init());
return _limiter_tracker_sptr;
}

void enable_wait_gc() { _wait_gc = true; }
void disable_wait_gc() { _wait_gc = false; }
[[nodiscard]] bool wait_gc() const { return _wait_gc; }
Expand Down Expand Up @@ -141,7 +149,8 @@ class ThreadMemTrackerMgr {
// A thread of query/load will only wait once during execution.
bool _wait_gc = false;

std::shared_ptr<MemTrackerLimiter> _limiter_tracker;
std::shared_ptr<MemTrackerLimiter> _limiter_tracker_sptr {nullptr};
MemTrackerLimiter* _limiter_tracker {nullptr};
std::vector<MemTracker*> _consumer_tracker_stack;
std::weak_ptr<WorkloadGroup> _wg_wptr;

Expand All @@ -156,7 +165,8 @@ inline bool ThreadMemTrackerMgr::init() {
// 2. ExecEnv not initialized when thread start, initialized in limiter_mem_tracker().
if (_init) return true;
if (ExecEnv::GetInstance()->orphan_mem_tracker() != nullptr) {
_limiter_tracker = ExecEnv::GetInstance()->orphan_mem_tracker();
_limiter_tracker_sptr = ExecEnv::GetInstance()->orphan_mem_tracker();
_limiter_tracker = _limiter_tracker_sptr.get();
_wait_gc = true;
_init = true;
return true;
Expand Down
2 changes: 1 addition & 1 deletion be/src/runtime/thread_context.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class MemTracker;
QueryThreadContext ThreadContext::query_thread_context() {
DCHECK(doris::pthread_context_ptr_init);
ORPHAN_TRACKER_CHECK();
return {_task_id, thread_mem_tracker_mgr->limiter_mem_tracker(), _wg_wptr};
return {_task_id, thread_mem_tracker_mgr->limiter_mem_tracker_sptr(), _wg_wptr};
}

void AttachTask::init(const QueryThreadContext& query_thread_context) {
Expand Down
13 changes: 7 additions & 6 deletions be/src/runtime/thread_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class ThreadContext {
// to nullptr, but the object it points to is not initialized. At this time, when the memory
// is released somewhere, the hook is triggered to cause the crash.
std::unique_ptr<ThreadMemTrackerMgr> thread_mem_tracker_mgr;
[[nodiscard]] std::shared_ptr<MemTrackerLimiter> thread_mem_tracker() const {
[[nodiscard]] MemTrackerLimiter* thread_mem_tracker() const {
return thread_mem_tracker_mgr->limiter_mem_tracker();
}

Expand Down Expand Up @@ -402,7 +402,8 @@ class QueryThreadContext {
#ifndef BE_TEST
ORPHAN_TRACKER_CHECK();
query_id = doris::thread_context()->task_id();
query_mem_tracker = doris::thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker();
query_mem_tracker =
doris::thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker_sptr();
wg_wptr = doris::thread_context()->workload_group();
#else
query_id = TUniqueId();
Expand Down Expand Up @@ -468,8 +469,8 @@ class SwitchThreadMemTrackerLimiter {
const std::shared_ptr<doris::MemTrackerLimiter>& mem_tracker) {
DCHECK(mem_tracker);
doris::ThreadLocalHandle::create_thread_local_if_not_exits();
if (mem_tracker != thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker()) {
_old_mem_tracker = thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker();
if (mem_tracker != thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker_sptr()) {
_old_mem_tracker = thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker_sptr();
thread_context()->thread_mem_tracker_mgr->attach_limiter_tracker(mem_tracker);
}
}
Expand All @@ -480,8 +481,8 @@ class SwitchThreadMemTrackerLimiter {
query_thread_context.query_id); // workload group alse not change
DCHECK(query_thread_context.query_mem_tracker);
if (query_thread_context.query_mem_tracker !=
thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker()) {
_old_mem_tracker = thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker();
thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker_sptr()) {
_old_mem_tracker = thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker_sptr();
thread_context()->thread_mem_tracker_mgr->attach_limiter_tracker(
query_thread_context.query_mem_tracker);
}
Expand Down
3 changes: 2 additions & 1 deletion be/src/util/byte_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ struct ByteBuffer : private Allocator<false> {
: pos(0),
limit(capacity_),
capacity(capacity_),
mem_tracker_(doris::thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker()) {
mem_tracker_(
doris::thread_context()->thread_mem_tracker_mgr->limiter_mem_tracker_sptr()) {
ptr = reinterpret_cast<char*>(Allocator<false>::alloc(capacity_));
}

Expand Down
Loading