Skip to content
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

Jump to bottom

[fix] teach BufferedBlockMgr2 track memory right #9722

Merged
merged 1 commit into from
May 24, 2022
Merged

[fix] teach BufferedBlockMgr2 track memory right #9722

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
11 changes: 4 additions & 7 deletions be/src/runtime/buffered_block_mgr2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,7 @@ bool BufferedBlockMgr2::consume_memory(Client* client, int64_t size) {
}
int buffers_needed = BitUtil::ceil(size, max_block_size());
unique_lock<mutex> lock(_lock);
Status st = _mem_tracker->try_consume(size);
WARN_IF_ERROR(st, "consume failed");
if (size < max_block_size() && st) {
if (size < max_block_size() && _mem_tracker->try_consume(size)) {
dataroaring marked this conversation as resolved.
Show resolved Hide resolved
// For small allocations (less than a block size), just let the allocation through.
client->_tracker->consume(size);
return true;
Expand All @@ -328,7 +326,7 @@ bool BufferedBlockMgr2::consume_memory(Client* client, int64_t size) {
if (available_buffers(client) + client->_num_tmp_reserved_buffers < buffers_needed) {
return false;
}
st = _mem_tracker->try_consume(size);
Status st = _mem_tracker->try_consume(size);
WARN_IF_ERROR(st, "consume failed");
if (st) {
// There was still unallocated memory, don't need to recycle allocated blocks.
Expand Down Expand Up @@ -1083,10 +1081,9 @@ Status BufferedBlockMgr2::find_buffer_for_block(Block* block, bool* in_mem) {
Status BufferedBlockMgr2::find_buffer(unique_lock<mutex>& lock, BufferDescriptor** buffer_desc) {
*buffer_desc = nullptr;

Status st = _mem_tracker->try_consume(_max_block_size);
WARN_IF_ERROR(st, "try to allocate a new buffer failed");
// First, try to allocate a new buffer.
if (_free_io_buffers.size() < _block_write_threshold && st) {
if (_free_io_buffers.size() < _block_write_threshold &&
_mem_tracker->try_consume(_max_block_size)) {
uint8_t* new_buffer = new uint8_t[_max_block_size];
*buffer_desc = _obj_pool.add(new BufferDescriptor(new_buffer, _max_block_size));
(*buffer_desc)->all_buffers_it =
Expand Down