fix(storage): fix correct_commit_ssts with sst table_ids #18414
Merged
Conversation
This file contains 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
hzxa21
reviewed
Sep 5, 2024
| @@ -426,15 +426,17 @@ impl HummockManager { | |||
| for (mut sst, group_table_ids) in sst_to_cg_vec { | |||
| for (group_id, match_ids) in group_table_ids { | |||
| let group_members_table_ids = group_members_table_ids.get(&group_id).unwrap(); | |||
| if match_ids | |||
| if sst | |||
There was a problem hiding this comment.
It seems unnecessary and unclear to put this under the nested for loop. What we want to do here is to avoid SST split if all existing table ids of a sst belong to one and only one compaction group. Therefore, I suggest we put this check before L427 in the outer for loop. IIUC, we only need to check whether group_table_ids.len() == 1.
There was a problem hiding this comment.
Btw, do you think we need to modify table_ids and sst_size if group_table_ids.len() == 1 but table_ids in SstableInfo is a super set of group_member_table_ids (i.e. L407 is hit)
…nto li0k/storage_fix_correct_commit_ssts
…nto li0k/storage_fix_correct_commit_ssts
hzxa21
approved these changes
Sep 5, 2024
| let set1: HashSet<_> = sst_info.table_ids.iter().cloned().collect(); | ||
| let set2: HashSet<_> = new_sst_table_ids.iter().cloned().collect(); | ||
| // sst.table_ids = vec[1, 2, 3]; | ||
| // new.table_ids = vec[2, 3, 4]; |
…nto li0k/storage_fix_correct_commit_ssts
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.
What's changed and what's your intention?
The main branch will directly commits the sst directly to both cgs (when match_ids is a subset of group_table_ids) , the sst_id is not changed and something goes wrong when merge is triggered.
risingwave/src/storage/src/hummock/utils.rs
Line 112 in cb29fe0
Hummock
filter_single_sstvia binary_search which rely on the ordering of sstable_info.table_ids. I made some mistakes before this PR that broke ordering, so I'm reviewing the code and adding restrictions and doc to ensure ordering of table_ids. Thanks @hzxa21 for helpChecklist
./risedev check(or alias,./risedev c)Documentation
Release note
If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.