Skip to content

Commit 3585fe6

Browse files
xinyiZzzdataroaring
authored andcommitted
[fix][mem tracker] Fix logout load task mem tracker dcheck fail (apache#9943)
* fix tracker 0602 * fix format
1 parent 429a41d commit 3585fe6

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

‎be/src/runtime/load_channel.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ LoadChannel::LoadChannel(const UniqueId& load_id, int64_t mem_limit, int64_t tim
3434
_is_vec(is_vec) {
3535
_mem_tracker = MemTracker::create_tracker(
3636
mem_limit, "LoadChannel:tabletId=" + _load_id.to_string(),
37-
ExecEnv::GetInstance()->task_pool_mem_tracker_registry()->get_task_mem_tracker(
38-
_load_id.to_string()),
37+
ExecEnv::GetInstance()->task_pool_mem_tracker_registry()->register_load_mem_tracker(
38+
_load_id.to_string(), mem_limit),
3939
MemTrackerLevel::TASK);
4040
// _last_updated_time should be set before being inserted to
4141
// _load_channels in load_channel_mgr, or it may be erased

‎be/src/runtime/mem_tracker_task_pool.cpp‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,14 @@ void MemTrackerTaskPool::logout_task_mem_tracker() {
8989
}
9090
}
9191
for (auto tid : expired_tasks) {
92-
DCHECK(_task_mem_trackers[tid].use_count() == 1);
93-
_task_mem_trackers.erase(tid);
94-
VLOG_FILE << "Deregister task memory tracker, task id: " << tid;
92+
// This means that after all RuntimeState is destructed,
93+
// there are still task mem trackers that are get or register.
94+
// The only known case: after an load task ends all fragments on a BE,`tablet_writer_open` is still
95+
// called to create a channel, and the load task tracker will be re-registered in the channel open.
96+
if (_task_mem_trackers[tid].use_count() == 1) {
97+
_task_mem_trackers.erase(tid);
98+
VLOG_FILE << "Deregister task memory tracker, task id: " << tid;
99+
}
95100
}
96101
}
97102

0 commit comments

Comments
 (0)