Uh oh!
There was an error while loading. Please reload this page.
branch-4.0: [fix](filecache) fix clear_file_cache right after reboot causing file cache size percent overflow(pick#63410) - #64233
Merged
morningman merged 2 commits intoJun 23, 2026
Conversation
hello-stephen
commented
Jun 8, 2026
Contributor
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
freemandealer
commented
Jun 8, 2026
MemberAuthor
run buildall |
Issue Number: None Related PR: None Problem Summary: When file cache LRU restore creates a block from dump metadata and later lazy loading finds the same hash/offset with a smaller real file size, reset_range only updated the LRU queue size and _cur_cache_size. The FileBlock range still kept the old restored size, so a later async clear or eviction subtracted the old block size and could underflow _cur_cache_size, producing huge size_percent values in need-evict-cache-in-advance logs. This change makes reset_range update the FileBlock range as the single place that keeps the FileBlock, LRU queue, _cur_cache_size, and TTL size accounting consistent. FileBlock::finalize now delegates the range shrink to reset_range instead of changing the range before calling it. None - Test: Unit Test / Manual test - Added BE UT BlockFileCacheTest.lru_restore_size_mismatch_does_not_underflow_on_clear - Ran build-support/clang-format.sh with clang-format 16 - Ran build-support/check-format.sh with clang-format 16 - Ran DORIS_TOOLCHAIN=clang DISABLE_BE_JAVA_EXTENSIONS=ON ENABLE_INJECTION_POINT=ON ENABLE_CACHE_LOCK_DEBUG=0 ENABLE_PCH=0 sh run-be-ut.sh --run --filter=BlockFileCacheTest.lru_restore_size_mismatch_does_not_underflow_on_clear - Behavior changed: No - Does this need documentation: No Picked from: apache#63410
freemandealerforce-pushed
the
pick-branch-4.0-pr-63410
branch
from
June 8, 2026 14:47
4abbdbf to
a930641Comparefreemandealer
commented
Jun 9, 2026
MemberAuthor
run buildall |
hello-stephen
commented
Jun 9, 2026
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
freemandealer
commented
Jun 17, 2026
MemberAuthor
run buildall |
freemandealer
commented
Jun 17, 2026
MemberAuthor
run buildall |
hello-stephen
commented
Jun 17, 2026
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
morningman
approved these changes
Jun 23, 2026
Uh oh!
There was an error while loading. Please reload this page.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Original PR: #63410
Picked to: branch-4.0
Pick branch: freemandealer:pick-branch-4.0-pr-63410
Validation:
Notes:
Resolved block_file_cache.h comment conflict against branch-4.0. Fixed block_file_cache_test.cpp to match the branch-4.0 FSFileCacheStorage::handle_already_loaded_block signature.