[fix](storage-engine) _clean_unused_rowset_metas should skip rowsets in _unused_rowsets map #59390
+6
−3
Conversation
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
…in _unused_rowsets map
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
There was a problem hiding this comment.
Pull request overview
This PR fixes a bug in the storage engine where _clean_unused_rowset_metas could incorrectly remove metadata for rowsets that are still tracked in the _unused_rowsets map, which holds rowsets pending deletion. The fix adds a check to skip these rowsets during cleanup, preventing premature metadata removal.
Key Changes:
- Added thread-safe check to skip rowsets in
_unused_rowsetsmap during metadata cleanup - Enhanced debug code to test the interaction between unused rowset deletion and trash sweeping
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| be/src/olap/storage_engine.cpp | Added check_rowset_id_in_unused_rowsets check at line 961 to prevent cleaning metadata for rowsets pending deletion in the _unused_rowsets map |
| be/src/olap/tablet.cpp | Reformatted debug code and added start_trash_sweep call for testing the complete cleanup workflow |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
Author
|
run buildall |
Contributor
|
PR approved by anyone and no changes requested. |
TPC-H: Total hot run time: 35391 ms |
TPC-DS: Total hot run time: 180589 ms |
ClickBench: Total hot run time: 27.35 s |
BE UT Coverage ReportIncrement line coverage Increment coverage report
|
Contributor
BE Regression && UT Coverage ReportIncrement line coverage Increment coverage report
|
github-actions
bot
added
the
approved
Contributor
|
PR approved by at least one committer and no changes requested. |
github-actions bot
pushed a commit
that referenced
this pull request
Dec 26, 2025
…in _unused_rowsets map (#59390) ### What problem does this PR solve? `_clean_unused_rowset_metas` could incorrectly remove rowset metas (and its delete_bitmap) that are still tracked in the `_unused_rowsets` map, which holds rowsets pending deletion. The fix adds a check to skip these rowsets during cleanup, preventing premature removal of `_unused_rowsets`. Otherwise, if query a mow table with rowsets in `_unused_rowsets` map, and `_clean_unused_rowset_metas` delete delete_bitmap of these rowset, will get duplicated keys. ### Release note None ### Check List (For Author) - Test <!-- At least one of them must be included. --> - [ ] Regression test - [ ] Unit Test - [ ] Manual test (add detailed scripts or steps below) - [ ] No need to test or manual test. Explain why: - [ ] This is a refactor/code format and no logic has been changed. - [ ] Previous test can cover this change. - [ ] No code files have been changed. - [ ] Other reason <!-- Add your reason? --> - Behavior changed: - [ ] No. - [ ] Yes. <!-- Explain the behavior change --> - Does this need documentation? - [ ] No. - [ ] Yes. <!-- Add document PR link here. eg: apache/doris-website#1214 --> ### Check List (For Reviewer who merge this PR) - [ ] Confirm the release note - [ ] Confirm test cases - [ ] Confirm document - [ ] Add branch pick label <!-- Add branch pick label that this PR should merge into -->
github-actions bot
pushed a commit
that referenced
this pull request
Dec 26, 2025
…in _unused_rowsets map (#59390) ### What problem does this PR solve? `_clean_unused_rowset_metas` could incorrectly remove rowset metas (and its delete_bitmap) that are still tracked in the `_unused_rowsets` map, which holds rowsets pending deletion. The fix adds a check to skip these rowsets during cleanup, preventing premature removal of `_unused_rowsets`. Otherwise, if query a mow table with rowsets in `_unused_rowsets` map, and `_clean_unused_rowset_metas` delete delete_bitmap of these rowset, will get duplicated keys. ### Release note None ### Check List (For Author) - Test <!-- At least one of them must be included. --> - [ ] Regression test - [ ] Unit Test - [ ] Manual test (add detailed scripts or steps below) - [ ] No need to test or manual test. Explain why: - [ ] This is a refactor/code format and no logic has been changed. - [ ] Previous test can cover this change. - [ ] No code files have been changed. - [ ] Other reason <!-- Add your reason? --> - Behavior changed: - [ ] No. - [ ] Yes. <!-- Explain the behavior change --> - Does this need documentation? - [ ] No. - [ ] Yes. <!-- Add document PR link here. eg: apache/doris-website#1214 --> ### Check List (For Reviewer who merge this PR) - [ ] Confirm the release note - [ ] Confirm test cases - [ ] Confirm document - [ ] Add branch pick label <!-- Add branch pick label that this PR should merge into -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
What problem does this PR solve?
_clean_unused_rowset_metascould incorrectly remove rowset metas (and its delete_bitmap) that are still tracked in the_unused_rowsetsmap, which holds rowsets pending deletion.The fix adds a check to skip these rowsets during cleanup, preventing premature removal of
_unused_rowsets. Otherwise, if query a mow table with rowsets in_unused_rowsetsmap, and_clean_unused_rowset_metasdelete delete_bitmap of these rowset, will get duplicated keys.Release note
None
Check List (For Author)
Test
Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)