This is an automated email from the ASF dual-hosted git repository.
zouxinyi 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 ab794768988 [fix](memory) Fix WorkloadGroup memory GC cancel msg
(#47367)
ab794768988 is described below
commit ab794768988fae5f7963982de7163bf02b0b1c99
Author: Xinyi Zou <[email protected]>
AuthorDate: Wed Feb 5 11:20:00 2025 +0800
[fix](memory) Fix WorkloadGroup memory GC cancel msg (#47367)
### What problem does this PR solve?
Make cancel message clearer.
---
be/src/runtime/workload_group/workload_group.cpp | 36 +++++++++++++-----------
1 file changed, 19 insertions(+), 17 deletions(-)
diff --git a/be/src/runtime/workload_group/workload_group.cpp
b/be/src/runtime/workload_group/workload_group.cpp
index d68a69cc981..3574f9268e5 100644
--- a/be/src/runtime/workload_group/workload_group.cpp
+++ b/be/src/runtime/workload_group/workload_group.cpp
@@ -219,41 +219,43 @@ int64_t WorkloadGroup::gc_memory(int64_t need_free_mem,
RuntimeProfile* profile,
std::string cancel_str = "";
if (is_minor_gc) {
cancel_str = fmt::format(
- "MinorGC kill overcommit query, wg id:{}, name:{}, used:{},
limit:{}, "
- "backend:{}.",
- _id, _name, MemCounter::print_bytes(used_memory),
- MemCounter::print_bytes(_memory_limit),
BackendOptions::get_localhost());
+ "Process memory not enough, {}, Memory GC in
WorkloadGroup[id:{}, name:{}, "
+ "used:{}, limit:{}, enable_memory_overcommit:true],
backend:{}.",
+ GlobalMemoryArbitrator::process_mem_log_str(), _id, _name,
+ MemCounter::print_bytes(used_memory),
MemCounter::print_bytes(_memory_limit),
+ BackendOptions::get_localhost());
} else {
if (_enable_memory_overcommit) {
cancel_str = fmt::format(
- "FullGC release wg overcommit mem, wg id:{}, name:{}, "
- "used:{},limit:{},backend:{}.",
- _id, _name, MemCounter::print_bytes(used_memory),
- MemCounter::print_bytes(_memory_limit),
BackendOptions::get_localhost());
+ "Process memory not enough, {}, Memory GC in
WorkloadGroup[id:{}, name:{}, "
+ "used:{}, limit:{}, enable_memory_overcommit:true],
backend:{}.",
+ GlobalMemoryArbitrator::process_mem_log_str(), _id, _name,
+ MemCounter::print_bytes(used_memory),
MemCounter::print_bytes(_memory_limit),
+ BackendOptions::get_localhost());
} else {
cancel_str = fmt::format(
- "GC wg for hard limit, wg id:{}, name:{}, used:{},
limit:{}, "
- "backend:{}.",
+ "WorkloadGroup memory exceed limit, Memory GC in in
WorkloadGroup[id:{}, "
+ "name:{}, used:{}, "
+ "limit:{}, enable_memory_overcommit:false], {},
backend:{}.",
_id, _name, MemCounter::print_bytes(used_memory),
- MemCounter::print_bytes(_memory_limit),
BackendOptions::get_localhost());
+ MemCounter::print_bytes(_memory_limit),
+ GlobalMemoryArbitrator::process_mem_log_str(),
BackendOptions::get_localhost());
}
}
auto cancel_top_overcommit_str = [cancel_str](int64_t mem_consumption,
const std::string& label) {
return fmt::format(
- "{} cancel top memory overcommit tracker <{}> consumption {}.
details:{}, "
+ "{} cancel top memory overcommit tracker <{}> consumption {}. "
"Execute "
"again after enough memory, details see be.INFO.",
- cancel_str, label, MemCounter::print_bytes(mem_consumption),
- GlobalMemoryArbitrator::process_limit_exceeded_errmsg_str());
+ cancel_str, label, MemCounter::print_bytes(mem_consumption));
};
auto cancel_top_usage_str = [cancel_str](int64_t mem_consumption, const
std::string& label) {
return fmt::format(
- "{} cancel top memory used tracker <{}> consumption {}.
details:{}, Execute "
+ "{} cancel top memory used tracker <{}> consumption {}.
Execute "
"again "
"after enough memory, details see be.INFO.",
- cancel_str, label, MemCounter::print_bytes(mem_consumption),
-
GlobalMemoryArbitrator::process_soft_limit_exceeded_errmsg_str());
+ cancel_str, label, MemCounter::print_bytes(mem_consumption));
};
LOG(INFO) << fmt::format(
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
