thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

More checks for concurrently deleted files and dirs

Browse Source
This commit is contained in:
Alexander Gololobov 2024-05-02 14:39:59 +02:00
parent 136262619f
commit 84bed102f1
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Storages/System/StorageSystemRemoteDataPaths.cpp
View File

@ -245,13 +245,20 @@ bool SystemRemoteDataPathsSource::nextFile()
try
{
const auto & disk = disks[current_disk].second;
const auto current_path = getCurrentPath();
/// Files or directories can disappear due to concurrent operations
if (!disk->exists(current_path))
continue;
/// Stop if current path is a file
if (disk->isFile(getCurrentPath()))
if (disk->isFile(current_path))
return true;
/// If current path is a directory list its contents and step into it
std::vector<std::string> children;
disk->listFiles(getCurrentPath(), children);
disk->listFiles(current_path, children);
/// Use current predicate for all children
const auto & skip_predicate = getCurrentSkipPredicate();
@ -271,6 +278,14 @@ bool SystemRemoteDataPathsSource::nextFile()
throw;
}
catch (const fs::filesystem_error & e)
{
/// Files or directories can disappear due to concurrent operations
if (e.code() == std::errc::no_such_file_or_directory)
continue;
throw;
}
}
}