Skip to content

[fix](memory) Fix MacOS mem_limit parse error and GC after env Init #17528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 1 commit into from
Mar 8, 2023
Merged

[fix](memory) Fix MacOS mem_limit parse error and GC after env Init #17528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion be/src/common/daemon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ void Daemon::memory_gc_thread() {
int64_t cache_gc_freed_mem = 0;
while (!_stop_background_threads_latch.wait_for(
std::chrono::milliseconds(interval_milliseconds))) {
if (!MemInfo::initialized()) {
if (!MemInfo::initialized() || !ExecEnv::GetInstance()->initialized()) {
continue;
}
if (memory_full_gc_sleep_time_ms <= 0 &&
Expand Down
9 changes: 7 additions & 2 deletions be/src/util/mem_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,13 @@ void MemInfo::init() {
_s_physical_mem = -1;
}

bool is_percent = true;
_s_mem_limit = ParseUtil::parse_mem_spec(config::mem_limit, -1, _s_physical_mem, &is_percent);
if (config::mem_limit == "auto") {
_s_mem_limit = std::max<int64_t>(_s_physical_mem * 0.9, _s_physical_mem - 6871947672);
} else {
bool is_percent = true;
_s_mem_limit =
ParseUtil::parse_mem_spec(config::mem_limit, -1, _s_physical_mem, &is_percent);
}
_s_mem_limit_str = PrettyPrinter::print(_s_mem_limit, TUnit::BYTES);
_s_soft_mem_limit = _s_mem_limit * config::soft_mem_limit_frac;
_s_soft_mem_limit_str = PrettyPrinter::print(_s_soft_mem_limit, TUnit::BYTES);
Expand Down