[Fix](recycler) Further fix for #47475 #47486
Open
+17
−11
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
Yukang-Lian
requested review from
gavinchou,
dataroaring and
w41ter
as code owners
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
|
run buildall |
gavinchou
reviewed
Jan 30, 2025
| // Tmp rowsets may not be recycled in recycle_tablet correctly, | ||
| // here we can not skip recycling them | ||
| if (!is_recycle_tmp_rowset) { | ||
| { |
There was a problem hiding this comment.
redundant indention (extra curly brace)
gavinchou
reviewed
Jan 30, 2025
Comment on lines
+225
to
+226
| int delete_rowset_data(const std::vector<doris::RowsetMetaCloudPB>& rowsets, | ||
| bool is_recycle_tmp_rowset = false); |
There was a problem hiding this comment.
Use enum class
enum class RowsetRecyclingState {
FORMAL_ROWSET,
TMP_ROWSET,
};
int delete_rowset_data(const std::vector<doris::RowsetMetaCloudPB>& rowsets,
RowsetRecyclingState type);
gavinchou
reviewed
Jan 30, 2025
Comment on lines
+225
to
+226
| int delete_rowset_data(const std::vector<doris::RowsetMetaCloudPB>& rowsets, | ||
| bool is_recycle_tmp_rowset = false); |
There was a problem hiding this comment.
Use enum class
enum class RowsetRecyclingState {
FORMAL_ROWSET,
TMP_ROWSET,
};
int delete_rowset_data(const std::vector<doris::RowsetMetaCloudPB>& rowsets,
RowsetRecyclingState type);
gavinchou
reviewed
Jan 30, 2025
Comment on lines
+225
to
+226
| int delete_rowset_data(const std::vector<doris::RowsetMetaCloudPB>& rowsets, | ||
| bool is_recycle_tmp_rowset = false); |
There was a problem hiding this comment.
Use enum class
enum class RowsetRecyclingState {
FORMAL_ROWSET,
TMP_ROWSET,
};
int delete_rowset_data(const std::vector<doris::RowsetMetaCloudPB>& rowsets,
RowsetRecyclingState type);
gavinchou
reviewed
Jan 30, 2025
Comment on lines
+1476
to
+1477
| // Tmp rowsets may not be recycled in recycle_tablet correctly, | ||
| // here we can not skip recycling them |
There was a problem hiding this comment.
Suggested change
| // Tmp rowsets may not be recycled in recycle_tablet correctly, | |
| // here we can not skip recycling them | |
| // we have to treat tmp rowset as "orphans" that may not related to any existing tablets | |
| // due to aborted schema change. |
gavinchou
reviewed
Jan 30, 2025
| @@ -1499,7 +1504,7 @@ int InstanceRecycler::delete_rowset_data(const std::vector<doris::RowsetMetaClou | |||
| std::vector<std::pair<int64_t, std::string>> index_ids; | |||
| // default format as v1. | |||
| InvertedIndexStorageFormatPB index_format = InvertedIndexStorageFormatPB::V1; | |||
|
|
|||
| int get_ret = 0; | |||
There was a problem hiding this comment.
suggested naming inverted_index_get_ret
gavinchou
reviewed
Jan 30, 2025
| @@ -1562,7 +1566,8 @@ int InstanceRecycler::delete_rowset_data(const std::vector<doris::RowsetMetaClou | |||
| file_paths.push_back(inverted_index_path_v1(tablet_id, rowset_id, i, | |||
| index_id.first, index_id.second)); | |||
| } | |||
| } else if (!index_ids.empty()) { | |||
| } else if (!index_ids.empty() || get_ret == 1) { | |||
There was a problem hiding this comment.
add comment "we treat schema not found as if it has a v2 format inverted index to reduce chance of data leakage"
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.
What problem does this PR solve?
Issue Number: close #xxx
Related PR: #47475
Problem Summary:
Release note
None
Check List (For Author)
Test
Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)