Skip to content

[enhancement](trash) support skip trash, update trash default expire time (#37170) #37409

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
zhannngchen merged 1 commit into from
Jul 8, 2024
Merged

[enhancement](trash) support skip trash, update trash default expire time (#37170) #37409

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
2 changes: 1 addition & 1 deletion be/src/common/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ DEFINE_mInt32(garbage_sweep_batch_size, "100");
DEFINE_mInt32(snapshot_expire_time_sec, "172800");
// It is only a recommended value. When the disk space is insufficient,
// the file storage period under trash dose not have to comply with this parameter.
DEFINE_mInt32(trash_file_expire_time_sec, "259200");
DEFINE_mInt32(trash_file_expire_time_sec, "86400");
// minimum file descriptor number
// modify them upon necessity
DEFINE_Int32(min_file_descriptor_number, "60000");
Expand Down
8 changes: 7 additions & 1 deletion be/src/olap/data_dir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,8 +927,14 @@ void DataDir::disks_compaction_num_increment(int64_t delta) {
}

Status DataDir::move_to_trash(const std::string& tablet_path) {
Status res = Status::OK();
if (config::trash_file_expire_time_sec <= 0) {
LOG(INFO) << "delete tablet dir " << tablet_path
<< " directly due to trash_file_expire_time_sec is 0";
RETURN_IF_ERROR(io::global_local_filesystem()->delete_directory(tablet_path));
return delete_tablet_parent_path_if_empty(tablet_path);
}

Status res = Status::OK();
// 1. get timestamp string
string time_str;
if ((res = gen_timestamp_string(&time_str)) != Status::OK()) {
Expand Down