database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](gc) process exception while iteratoring directory (#30850)

Browse Source
This commit is contained in:
zhannngchen
2024-02-06 19:03:59 +08:00
committed by yiguolei
parent b23a785775
commit c4a8d5497d
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
be/src/io/fs/local_file_system.cpp
View File

@ -203,23 +203,30 @@ Status LocalFileSystem::list_impl(const Path& dir, bool only_file, std::vector<F
return Status::OK();
}
std::error_code ec;
for (const auto& entry : std::filesystem::directory_iterator(dir, ec)) {
if (only_file && !entry.is_regular_file()) {
continue;
}
FileInfo file_info;
file_info.file_name = entry.path().filename();
file_info.is_file = entry.is_regular_file(ec);
if (ec) {
break;
}
if (file_info.is_file) {
file_info.file_size = entry.file_size(ec);
try {
for (const auto& entry : std::filesystem::directory_iterator(dir, ec)) {
if (only_file && !entry.is_regular_file()) {
continue;
}
FileInfo file_info;
file_info.file_name = entry.path().filename();
file_info.is_file = entry.is_regular_file(ec);
if (ec) {
break;
}
if (file_info.is_file) {
file_info.file_size = entry.file_size(ec);
if (ec) {
break;
}
}
files->push_back(std::move(file_info));
}
files->push_back(std::move(file_info));
} catch (const std::filesystem::filesystem_error& e) {
// although `directory_iterator(dir, ec)` does not throw an exception,
// it may throw an exception during iterator++, so we need to catch the exception here
return localfs_error(e.code(), fmt::format("failed to list {}, error message: {}",
dir.native(), e.what()));
}
if (ec) {
return localfs_error(ec, fmt::format("failed to list {}", dir.native()));