Skip to content
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

[Fix](recycler) Further fix for #47475 #47486

Merged
merged 4 commits into from
Feb 3, 2025
Merged

[Fix](recycler) Further fix for #47475 #47486

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa96532
1
Yukang-Lian Jan 29, 2025
0e4ffb3
2
Yukang-Lian Jan 31, 2025
114b0b9
3
Yukang-Lian Jan 31, 2025
49bc751
4
Yukang-Lian Feb 1, 2025
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: 15 additions & 10 deletions cloud/src/recycler/recycler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1464,18 +1464,23 @@ int InstanceRecycler::delete_rowset_data(const doris::RowsetMetaCloudPB& rs_meta
return accessor->delete_files(file_paths);
}

int InstanceRecycler::delete_rowset_data(const std::vector<doris::RowsetMetaCloudPB>& rowsets) {
int InstanceRecycler::delete_rowset_data(const std::vector<doris::RowsetMetaCloudPB>& rowsets,
bool is_recycle_tmp_rowset) {
int ret = 0;
// resource_id -> file_paths
std::map<std::string, std::vector<std::string>> resource_file_paths;
// (resource_id, tablet_id, rowset_id)
std::vector<std::tuple<std::string, int64_t, std::string>> rowsets_delete_by_prefix;

for (const auto& rs : rowsets) {
{
std::lock_guard lock(recycled_tablets_mtx_);
if (recycled_tablets_.count(rs.tablet_id())) {
continue; // Rowset data has already been deleted
// Tmp rowsets may not be recycled in recycle_tablet correctly,
// here we can not skip recycling them
Yukang-Lian marked this conversation as resolved.
Show resolved Hide resolved
if (!is_recycle_tmp_rowset) {
{
Yukang-Lian marked this conversation as resolved.
Show resolved Hide resolved
std::lock_guard lock(recycled_tablets_mtx_);
if (recycled_tablets_.count(rs.tablet_id())) {
continue; // Rowset data has already been deleted
}
}
}

Expand All @@ -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;
Yukang-Lian marked this conversation as resolved.
Show resolved Hide resolved
if (rs.has_tablet_schema()) {
for (const auto& index : rs.tablet_schema().index()) {
if (index.has_index_type() && index.index_type() == IndexType::INVERTED) {
Expand All @@ -1519,8 +1524,7 @@ int InstanceRecycler::delete_rowset_data(const std::vector<doris::RowsetMetaClou
continue;
}
InvertedIndexInfo index_info;
int get_ret =
inverted_index_id_cache_->get(rs.index_id(), rs.schema_version(), index_info);
get_ret = inverted_index_id_cache_->get(rs.index_id(), rs.schema_version(), index_info);
if (get_ret == 0) {
index_format = index_info.first;
index_ids = index_info.second;
Expand Down Expand Up @@ -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) {
Yukang-Lian marked this conversation as resolved.
Show resolved Hide resolved
// try to recycle inverted index v2 when get_ret == 1
file_paths.push_back(inverted_index_path_v2(tablet_id, rowset_id, i));
}
}
Expand Down Expand Up @@ -2225,7 +2230,7 @@ int InstanceRecycler::recycle_tmp_rowsets() {
tmp_rowset_keys.clear();
tmp_rowsets.clear();
});
if (delete_rowset_data(tmp_rowsets) != 0) {
if (delete_rowset_data(tmp_rowsets, true) != 0) {
LOG(WARNING) << "failed to delete tmp rowset data, instance_id=" << instance_id_;
return -1;
}
Expand Down
3 changes: 2 additions & 1 deletion cloud/src/recycler/recycler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ class InstanceRecycler {
const std::string& rowset_id);

// return 0 for success otherwise error
int delete_rowset_data(const std::vector<doris::RowsetMetaCloudPB>& rowsets);
int delete_rowset_data(const std::vector<doris::RowsetMetaCloudPB>& rowsets,
bool is_recycle_tmp_rowset = false);
Yukang-Lian marked this conversation as resolved.
Show resolved Hide resolved
Yukang-Lian marked this conversation as resolved.
Show resolved Hide resolved
Yukang-Lian marked this conversation as resolved.
Show resolved Hide resolved

/**
* Get stage storage info from instance and init StorageVaultAccessor
Expand Down
Loading