Skip to content

fix garbage collect bug #1397

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

Merged
chaoyli merged 1 commit into from
Jun 27, 2019
Merged

fix garbage collect bug #1397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions be/src/common/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,10 @@ namespace config {
CONF_String(small_file_dir, "${DORIS_HOME}/lib/small_file/");
// path gc
CONF_Bool(path_gc_check, "true");
CONF_Int32(path_gc_check_interval_second, "1800");
CONF_Int32(path_gc_check_interval_second, "86400");
CONF_Int32(path_gc_check_step, "1000");
CONF_Int32(path_gc_check_step_interval_ms, "10");
CONF_Int32(path_scan_interval_second, "1800");
CONF_Int32(path_scan_interval_second, "86400");
} // namespace config

} // namespace doris
Expand Down
12 changes: 10 additions & 2 deletions be/src/olap/data_dir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,10 +964,17 @@ void DataDir::perform_path_gc_by_rowsetid() {
bool valid = tablet->check_rowset_id(rowset_id);
if (!valid) {
// if the rowset id is less than tablet's initial end rowset id
// and the path is not in unused_rowsets, delete the path.
// and the rowsetid is not in unused_rowsets
// and the rowsetid is not in committed rowsets
// then delete the path.
if (rowset_id < tablet->initial_end_rowset_id()
&& !StorageEngine::instance()->check_rowset_id_in_unused_rowsets(rowset_id)) {
_process_garbage_path(path);
RowsetMetaSharedPtr rowset_meta = nullptr;
OLAPStatus status = RowsetMetaManager::get_rowset_meta(
_meta, tablet->tablet_uid(), rowset_id, rowset_meta);
if (status == OLAP_ERR_META_KEY_NOT_FOUND) {
_process_garbage_path(path);
}
}
}
}
Expand All @@ -983,6 +990,7 @@ void DataDir::perform_path_scan() {
{
std::unique_lock<std::mutex> lck(_check_path_mutex);
if (_all_check_paths.size() > 0) {
LOG(INFO) << "_all_check_paths is not empty when path scan.";
return;
}
LOG(INFO) << "start to scan data dir path:" << _path;
Expand Down