Skip to content

[opt](filecache) Do not remove parent directory when clear file cache #49199

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
gavinchou merged 1 commit into from
Mar 22, 2025
Merged

[opt](filecache) Do not remove parent directory when clear file cache #49199

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
42 changes: 28 additions & 14 deletions be/src/io/cache/fs_file_cache_storage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,22 +700,36 @@ void FSFileCacheStorage::load_blocks_directly_unlocked(BlockFileCache* mgr, cons
}

Status FSFileCacheStorage::clear(std::string& msg) {
LOG(INFO) << "clear file storage, path=" << _cache_base_path;
std::error_code ec;
std::filesystem::directory_iterator key_it {_cache_base_path, ec};
if (ec) {
LOG(WARNING) << "Failed to list directory: " << _cache_base_path
<< ", error: " << ec.message();
return Status::InternalError("Failed to list dir {}: {}", _cache_base_path, ec.message());
}
int failed = 0;
int total = 0;
auto t0 = std::chrono::steady_clock::now();
for (; key_it != std::filesystem::directory_iterator(); ++key_it) {
if (!key_it->is_directory()) continue; // all file cache data is in sub-directories
++total;
std::string cache_key = key_it->path().filename().native();
auto st = global_local_filesystem()->delete_directory(cache_key);
if (st.ok()) continue;
failed++;
LOG(WARNING) << "failed to clear base_path=" << _cache_base_path
<< " path_to_delete=" << cache_key << " error=" << st;
}
auto t1 = std::chrono::steady_clock::now();
std::stringstream ss;
auto st = global_local_filesystem()->delete_directory(_cache_base_path);
if (!st.ok()) {
ss << "failed to clear_file_cache_directly, path=" << _cache_base_path
<< " delete dir failed: " << st;
LOG(WARNING) << ss.str();
msg = ss.str();
return Status::InternalError(ss.str());
}
st = global_local_filesystem()->create_directory(_cache_base_path);
if (!st.ok()) {
ss << "failed to clear_file_cache_directly, path=" << _cache_base_path
<< " create dir failed: " << st;
LOG(WARNING) << ss.str();
ss << "finished clear file storage, path=" << _cache_base_path
<< " deleted=" << (total - failed) << " failed=" << failed
<< " elapsed_ms=" << std::chrono::duration_cast<std::chrono::milliseconds>(t1 - t0).count();
LOG(INFO) << ss.str();
if (failed > 0) {
msg = ss.str();
return Status::InternalError(ss.str());
return Status::InternalError(msg);
}
return Status::OK();
}
Expand Down
Loading