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 9606252072d [fix](memory) temporarily close Allocator address
sanitizers #33862
9606252072d is described below
commit 9606252072d62c6cbc3c91224aad463de5c6c692
Author: Xinyi Zou <zouxiny...@gmail.com>
AuthorDate: Thu Apr 18 22:49:59 2024 +0800
[fix](memory) temporarily close Allocator address sanitizers #33862
---
be/src/runtime/memory/mem_tracker_limiter.cpp | 48 +++++++++++++--------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/be/src/runtime/memory/mem_tracker_limiter.cpp
b/be/src/runtime/memory/mem_tracker_limiter.cpp
index 4ddc4864056..647c7629301 100644
--- a/be/src/runtime/memory/mem_tracker_limiter.cpp
+++ b/be/src/runtime/memory/mem_tracker_limiter.cpp
@@ -123,7 +123,7 @@ MemTrackerLimiter::~MemTrackerLimiter() {
#ifdef NDEBUG
LOG(INFO) << err_msg;
#else
- LOG(FATAL) << err_msg << print_address_sanitizers();
+ LOG(INFO) << err_msg << print_address_sanitizers();
#endif
}
if (ExecEnv::tracking_memory()) {
@@ -132,10 +132,10 @@ MemTrackerLimiter::~MemTrackerLimiter() {
_consumption->set(0);
#ifndef NDEBUG
} else if (!_address_sanitizers.empty()) {
- LOG(FATAL) << "[Address Sanitizer] consumption is 0, but address
sanitizers not empty. "
- << ", mem tracker label: " << _label
- << ", peak consumption: " << _consumption->peak_value()
- << print_address_sanitizers();
+ LOG(INFO) << "[Address Sanitizer] consumption is 0, but address
sanitizers not empty. "
+ << ", mem tracker label: " << _label
+ << ", peak consumption: " << _consumption->peak_value()
+ << print_address_sanitizers();
#endif
}
g_memtrackerlimiter_cnt << -1;
@@ -147,13 +147,13 @@ void MemTrackerLimiter::add_address_sanitizers(void* buf,
size_t size) {
std::lock_guard<std::mutex> l(_address_sanitizers_mtx);
auto it = _address_sanitizers.find(buf);
if (it != _address_sanitizers.end()) {
- LOG(FATAL) << "[Address Sanitizer] memory buf repeat add, mem
tracker label: " << _label
- << ", consumption: " << _consumption->current_value()
- << ", peak consumption: " << _consumption->peak_value()
<< ", buf: " << buf
- << ", size: " << size << ", old buf: " << it->first
- << ", old size: " << it->second.size
- << ", new stack_trace: " << get_stack_trace()
- << ", old stack_trace: " << it->second.stack_trace;
+ LOG(INFO) << "[Address Sanitizer] memory buf repeat add, mem
tracker label: " << _label
+ << ", consumption: " << _consumption->current_value()
+ << ", peak consumption: " << _consumption->peak_value()
<< ", buf: " << buf
+ << ", size: " << size << ", old buf: " << it->first
+ << ", old size: " << it->second.size
+ << ", new stack_trace: " << get_stack_trace()
+ << ", old stack_trace: " << it->second.stack_trace;
}
// if alignment not equal to 0, maybe usable_size > size.
@@ -170,21 +170,21 @@ void MemTrackerLimiter::remove_address_sanitizers(void*
buf, size_t size) {
auto it = _address_sanitizers.find(buf);
if (it != _address_sanitizers.end()) {
if (it->second.size != size) {
- LOG(FATAL) << "[Address Sanitizer] free memory buf size
inaccurate, mem tracker "
- "label: "
- << _label << ", consumption: " <<
_consumption->current_value()
- << ", peak consumption: " <<
_consumption->peak_value()
- << ", buf: " << buf << ", size: " << size << ", old
buf: " << it->first
- << ", old size: " << it->second.size
- << ", new stack_trace: " << get_stack_trace()
- << ", old stack_trace: " << it->second.stack_trace;
+ LOG(INFO) << "[Address Sanitizer] free memory buf size
inaccurate, mem tracker "
+ "label: "
+ << _label << ", consumption: " <<
_consumption->current_value()
+ << ", peak consumption: " <<
_consumption->peak_value()
+ << ", buf: " << buf << ", size: " << size << ", old
buf: " << it->first
+ << ", old size: " << it->second.size
+ << ", new stack_trace: " << get_stack_trace()
+ << ", old stack_trace: " << it->second.stack_trace;
}
_address_sanitizers.erase(buf);
} else {
- LOG(FATAL) << "[Address Sanitizer] memory buf not exist, mem
tracker label: " << _label
- << ", consumption: " << _consumption->current_value()
- << ", peak consumption: " << _consumption->peak_value()
<< ", buf: " << buf
- << ", size: " << size << ", stack_trace: " <<
get_stack_trace();
+ LOG(INFO) << "[Address Sanitizer] memory buf not exist, mem
tracker label: " << _label
+ << ", consumption: " << _consumption->current_value()
+ << ", peak consumption: " << _consumption->peak_value()
<< ", buf: " << buf
+ << ", size: " << size << ", stack_trace: " <<
get_stack_trace();
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
