Skip to content

Commit

Permalink
[fix](load) fix memtable memory limiter total mem usage (#41245)
Browse files Browse the repository at this point in the history
## Proposed changes

Previously, `mem_usage = write_mem + flush_mem`, because `active_mem` is
included in `write_mem`.

After #40912, `write_mem` becomes `queue_mem`, which no longer includes
`active_mem`.
This PR fixes this problem, by setting `mem_usage = active_mem +
queue_mem + flush_mem`
  • Loading branch information
kaijchen authored Sep 25, 2024
1 parent 3dd71dc commit c95eff5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion be/src/olap/memtable_memory_limiter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ void MemTableMemoryLimiter::_refresh_mem_tracker() {
_writers.pop_back();
}
}
_mem_usage = _flush_mem_usage + _queue_mem_usage;
_mem_usage = _active_mem_usage + _queue_mem_usage + _flush_mem_usage;
g_memtable_active_memory.set_value(_active_mem_usage);
g_memtable_write_memory.set_value(_queue_mem_usage);
g_memtable_flush_memory.set_value(_flush_mem_usage);
Expand Down

0 comments on commit c95eff5

Please sign in to comment.