This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-3.0 in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push: new 77031acda00 Revert "branch-3.0: [fix](memory) Process available memory to increase the Jemalloc cache (#46991) 77031acda00 is described below commit 77031acda002a5c91ce01b26eecceccdbafed861 Author: Xinyi Zou <zouxi...@selectdb.com> AuthorDate: Wed Jan 15 01:02:26 2025 +0800 Revert "branch-3.0: [fix](memory) Process available memory to increase the Jemalloc cache (#46991) --- be/src/runtime/memory/global_memory_arbitrator.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/be/src/runtime/memory/global_memory_arbitrator.h b/be/src/runtime/memory/global_memory_arbitrator.h index a7a85725ab1..075113088fb 100644 --- a/be/src/runtime/memory/global_memory_arbitrator.h +++ b/be/src/runtime/memory/global_memory_arbitrator.h @@ -76,7 +76,7 @@ public: static inline int64_t sys_mem_available() { return MemInfo::_s_sys_mem_available.load(std::memory_order_relaxed) - refresh_interval_memory_growth.load(std::memory_order_relaxed) - - process_reserved_memory() + static_cast<int64_t>(MemInfo::allocator_cache_mem()); + process_reserved_memory(); } static inline std::string sys_mem_available_str() { @@ -91,14 +91,12 @@ public: static inline std::string sys_mem_available_details_str() { auto msg = fmt::format( "sys available memory {}(= {}[proc/available] - {}[reserved] - " - "{}B[waiting_refresh] + {}[tc/jemalloc_cache])", + "{}B[waiting_refresh])", PrettyPrinter::print(sys_mem_available(), TUnit::BYTES), PrettyPrinter::print(MemInfo::_s_sys_mem_available.load(std::memory_order_relaxed), TUnit::BYTES), PrettyPrinter::print(process_reserved_memory(), TUnit::BYTES), - refresh_interval_memory_growth, - PrettyPrinter::print(static_cast<uint64_t>(MemInfo::allocator_cache_mem()), - TUnit::BYTES)); + refresh_interval_memory_growth); #ifdef ADDRESS_SANITIZER msg = "[ASAN]" + msg; #endif --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org