database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[BUG] Fix printing ReservationTrackerCounters cause BE crash when mem_limit is reached (#6849)

Browse Source 
When the memory usage of BE reaches mem_limit, printing ReservationTrackerCounters through MemTracker
may cause BE crash in high concurrency.

ReservationTrackerCounters is not actually used in the current Doris, and the memory tracker in Doris
will be redesigned in the future.
This commit is contained in:
Xinyi Zou
2021-10-16 21:57:09 +08:00
committed by GitHub
parent 59017cebe6
commit eff076b355
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
be/src/runtime/mem_tracker.cpp
View File

@ -369,16 +369,19 @@ std::string MemTracker::LogUsage(int max_recursive_depth, const string& prefix,
if (CheckLimitExceeded(MemLimit::HARD)) ss << " memory limit exceeded.";
if (limit_ > 0) ss << " Limit=" << PrettyPrinter::print(limit_, TUnit::BYTES);
ReservationTrackerCounters* reservation_counters = reservation_counters_.load();
if (reservation_counters != nullptr) {
int64_t reservation = reservation_counters->peak_reservation->current_value();
ss << " Reservation=" << PrettyPrinter::print(reservation, TUnit::BYTES);
if (reservation_counters->reservation_limit != nullptr) {
int64_t limit = reservation_counters->reservation_limit->value();
ss << " ReservationLimit=" << PrettyPrinter::print(limit, TUnit::BYTES);
}
ss << " OtherMemory=" << PrettyPrinter::print(curr_consumption - reservation, TUnit::BYTES);
}
// TODO(zxy): ReservationTrackerCounters is not actually used in the current Doris.
// Printing here ReservationTrackerCounters may cause BE crash when high concurrency.
// The memory tracker in Doris will be redesigned in the future.
// ReservationTrackerCounters* reservation_counters = reservation_counters_.load();
// if (reservation_counters != nullptr) {
// int64_t reservation = reservation_counters->peak_reservation->current_value();
// ss << " Reservation=" << PrettyPrinter::print(reservation, TUnit::BYTES);
// if (reservation_counters->reservation_limit != nullptr) {
// int64_t limit = reservation_counters->reservation_limit->value();
// ss << " ReservationLimit=" << PrettyPrinter::print(limit, TUnit::BYTES);
// }
// ss << " OtherMemory=" << PrettyPrinter::print(curr_consumption - reservation, TUnit::BYTES);
// }
ss << " Total=" << PrettyPrinter::print(curr_consumption, TUnit::BYTES);
// Peak consumption is not accurate if the metric is lazily updated (i.e.
// this is a non-root tracker that exists only for reporting purposes).