This is an automated email from the ASF dual-hosted git repository.
yiguolei 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 59b0ed322dc [fix](memory) Fix query mem tracker log when destruction
not equal to 0 #34901
59b0ed322dc is described below
commit 59b0ed322dc3c2f7c0ec89bd20f4643642ec411d
Author: Xinyi Zou <zouxiny...@gmail.com>
AuthorDate: Thu May 16 23:47:55 2024 +0800
[fix](memory) Fix query mem tracker log when destruction not equal to 0
#34901
---
be/src/runtime/memory/mem_tracker_limiter.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/be/src/runtime/memory/mem_tracker_limiter.cpp
b/be/src/runtime/memory/mem_tracker_limiter.cpp
index c9b925fae3b..76ee63b5e26 100644
--- a/be/src/runtime/memory/mem_tracker_limiter.cpp
+++ b/be/src/runtime/memory/mem_tracker_limiter.cpp
@@ -115,17 +115,15 @@ MemTrackerLimiter::~MemTrackerLimiter() {
"transfer memory tracking value between two trackers, can use
transfer_to.";
if (_consumption->current_value() != 0) {
// TODO, expect mem tracker equal to 0 at the task end.
- if (doris::config::enable_memory_orphan_check && _type == Type::QUERY)
{
+#ifndef NDEBUG
+ if (_type == Type::QUERY) {
std::string err_msg =
fmt::format("mem tracker label: {}, consumption: {}, peak
consumption: {}, {}.",
label(), _consumption->current_value(),
_consumption->peak_value(),
mem_tracker_inaccurate_msg);
-#ifdef NDEBUG
- LOG(INFO) << err_msg;
-#else
LOG(INFO) << err_msg << print_address_sanitizers();
-#endif
}
+#endif
if (ExecEnv::tracking_memory()) {
ExecEnv::GetInstance()->orphan_mem_tracker()->consume(_consumption->current_value());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
