Skip to content

[enhancement](cloud) fix TTL cache size negative overflow #42869

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
dataroaring merged 2 commits into from
Oct 29, 2024
Merged

[enhancement](cloud) fix TTL cache size negative overflow #42869

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd8fc30
[enhancement](cloud) fix TTL cache size negative overflow
freemandealer Oct 16, 2024
a36a42a
response to the reviewer
freemandealer Oct 17, 2024
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
25 changes: 10 additions & 15 deletions be/src/io/cache/block_file_cache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,15 +243,12 @@ void BlockFileCache::use_cell(const FileBlockCell& cell, FileBlocks* result, boo
result->push_back(cell.file_block);
}

if (cell.file_block->cache_type() != FileCacheType::TTL ||
config::enable_ttl_cache_evict_using_lru) {
auto& queue = get_queue(cell.file_block->cache_type());
DCHECK(cell.queue_iterator) << "impossible";
/// Move to the end of the queue. The iterator remains valid.
if (move_iter_flag) {
queue.move_to_end(*cell.queue_iterator, cache_lock);
}
auto& queue = get_queue(cell.file_block->cache_type());
/// Move to the end of the queue. The iterator remains valid.
if (cell.queue_iterator && move_iter_flag) {
queue.move_to_end(*cell.queue_iterator, cache_lock);
}

cell.update_atime();
cell.is_deleted = false;
}
Expand Down Expand Up @@ -357,7 +354,7 @@ FileBlocks BlockFileCache::get_impl(const UInt128Wrapper& hash, const CacheConte
auto st = cell.file_block->change_cache_type_between_ttl_and_others(
FileCacheType::NORMAL);
if (st.ok()) {
if (config::enable_ttl_cache_evict_using_lru) {
if (cell.queue_iterator) {
auto& ttl_queue = get_queue(FileCacheType::TTL);
ttl_queue.remove(cell.queue_iterator.value(), cache_lock);
}
Expand Down Expand Up @@ -1052,7 +1049,7 @@ bool BlockFileCache::remove_if_ttl_file_unlock(const UInt128Wrapper& file_key, b
auto st = cell.file_block->change_cache_type_between_ttl_and_others(
FileCacheType::NORMAL);
if (st.ok()) {
if (config::enable_ttl_cache_evict_using_lru) {
if (cell.queue_iterator) {
ttl_queue.remove(cell.queue_iterator.value(), cache_lock);
}
auto& queue = get_queue(FileCacheType::NORMAL);
Expand Down Expand Up @@ -1129,7 +1126,7 @@ void BlockFileCache::reset_range(const UInt128Wrapper& hash, size_t offset, size
_files.find(hash)->second.find(offset) != _files.find(hash)->second.end());
FileBlockCell* cell = get_cell(hash, offset, cache_lock);
DCHECK(cell != nullptr);
if (cell->file_block->cache_type() != FileCacheType::TTL) {
if (cell->queue_iterator) {
auto& queue = get_queue(cell->file_block->cache_type());
DCHECK(queue.contains(hash, offset, cache_lock));
auto iter = queue.get(hash, offset, cache_lock);
Expand Down Expand Up @@ -1805,10 +1802,8 @@ std::string BlockFileCache::clear_file_cache_directly() {
<< " time_elapsed=" << duration_cast<milliseconds>(steady_clock::now() - start).count()
<< " num_files=" << num_files << " cache_size=" << cache_size
<< " index_queue_size=" << index_queue_size << " normal_queue_size=" << normal_queue_size
<< " disposible_queue_size=" << disposible_queue_size;
if (config::enable_ttl_cache_evict_using_lru) {
ss << "ttl_queue_size=" << ttl_queue_size;
}
<< " disposible_queue_size=" << disposible_queue_size << "ttl_queue_size=" << ttl_queue_size;

auto msg = ss.str();
LOG(INFO) << msg;
return msg;
Expand Down