This is an automated email from the ASF dual-hosted git repository.
wangbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 5eb3c608469 [Improment] Log fatal when compaction memtracker not
return zero (#40667)
5eb3c608469 is described below
commit 5eb3c608469b6534a6bff966a6c759a673a77da5
Author: wangbo <wan...@apache.org>
AuthorDate: Thu Sep 12 17:36:54 2024 +0800
[Improment] Log fatal when compaction memtracker not return zero (#40667)
---
be/src/agent/task_worker_pool.cpp | 4 ++--
be/src/runtime/memory/mem_tracker_limiter.cpp | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/be/src/agent/task_worker_pool.cpp
b/be/src/agent/task_worker_pool.cpp
index d4944711720..5906511ce15 100644
--- a/be/src/agent/task_worker_pool.cpp
+++ b/be/src/agent/task_worker_pool.cpp
@@ -189,7 +189,7 @@ void alter_tablet(StorageEngine& engine, const
TAgentTaskRequest& agent_task_req
new_tablet_id = agent_task_req.alter_tablet_req_v2.new_tablet_id;
new_schema_hash = agent_task_req.alter_tablet_req_v2.new_schema_hash;
auto mem_tracker = MemTrackerLimiter::create_shared(
- MemTrackerLimiter::Type::OTHER,
+ MemTrackerLimiter::Type::SCHEMA_CHANGE,
fmt::format("EngineAlterTabletTask#baseTabletId={}:newTabletId={}",
std::to_string(agent_task_req.alter_tablet_req_v2.base_tablet_id),
std::to_string(agent_task_req.alter_tablet_req_v2.new_tablet_id),
@@ -265,7 +265,7 @@ void alter_cloud_tablet(CloudStorageEngine& engine, const
TAgentTaskRequest& age
if (status.ok()) {
new_tablet_id = agent_task_req.alter_tablet_req_v2.new_tablet_id;
auto mem_tracker = MemTrackerLimiter::create_shared(
- MemTrackerLimiter::Type::OTHER,
+ MemTrackerLimiter::Type::SCHEMA_CHANGE,
fmt::format("EngineAlterTabletTask#baseTabletId={}:newTabletId={}",
std::to_string(agent_task_req.alter_tablet_req_v2.base_tablet_id),
std::to_string(agent_task_req.alter_tablet_req_v2.new_tablet_id),
diff --git a/be/src/runtime/memory/mem_tracker_limiter.cpp
b/be/src/runtime/memory/mem_tracker_limiter.cpp
index 5b3867b5347..85cceb365c8 100644
--- a/be/src/runtime/memory/mem_tracker_limiter.cpp
+++ b/be/src/runtime/memory/mem_tracker_limiter.cpp
@@ -129,7 +129,8 @@ MemTrackerLimiter::~MemTrackerLimiter() {
if (_consumption->current_value() != 0) {
// TODO, expect mem tracker equal to 0 at the load/compaction/etc. task end.
#ifndef NDEBUG
- if (_type == Type::QUERY || (_type == Type::LOAD &&
!is_group_commit_load)) {
+ if (_type == Type::COMPACTION || _type == Type::SCHEMA_CHANGE || _type
== Type::QUERY ||
+ (_type == Type::LOAD && !is_group_commit_load)) {
std::string err_msg =
fmt::format("mem tracker label: {}, consumption: {}, peak
consumption: {}, {}.",
label(), _consumption->current_value(),
_consumption->peak_value(),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
