diff options
Diffstat (limited to 'src/zenremotestore')
| -rw-r--r-- | src/zenremotestore/builds/buildstorageoperations.cpp | 23 | ||||
| -rw-r--r-- | src/zenremotestore/filesystemutils.cpp | 55 | ||||
| -rw-r--r-- | src/zenremotestore/include/zenremotestore/filesystemutils.h (renamed from src/zenremotestore/filesystemutils.h) | 5 |
3 files changed, 55 insertions, 28 deletions
diff --git a/src/zenremotestore/builds/buildstorageoperations.cpp b/src/zenremotestore/builds/buildstorageoperations.cpp index ecf5853b8..5c1b28695 100644 --- a/src/zenremotestore/builds/buildstorageoperations.cpp +++ b/src/zenremotestore/builds/buildstorageoperations.cpp @@ -7,6 +7,7 @@ #include <zenremotestore/builds/buildstoragecache.h> #include <zenremotestore/chunking/chunkblock.h> #include <zenremotestore/chunking/chunkingcontroller.h> +#include <zenremotestore/filesystemutils.h> #include <zencore/basicfile.h> #include <zencore/compactbinary.h> @@ -19,7 +20,6 @@ #include <zencore/string.h> #include <zencore/timer.h> #include <zencore/trace.h> -#include "../filesystemutils.h" #include <numeric> @@ -2124,7 +2124,7 @@ BuildsOperationUpdateFolder::Execute(FolderContent& OutLocalFolderState) DeleteCount++; } } - else + else if (!m_Options.WipeTargetFolder) { // Delete local file as we did not scavenge the folder RemoveLocalPathIndexes.push_back(LocalPathIndex); @@ -4650,15 +4650,9 @@ BuildsOperationUploadFolder::Execute() Stopwatch ProcessTimer; + CleanAndRemoveDirectory(m_IOWorkerPool, m_AbortFlag, m_PauseFlag, m_Options.TempDir); CreateDirectories(m_Options.TempDir); - CleanDirectory(m_Options.TempDir, {}); - auto _ = MakeGuard([&]() { - if (CleanDirectory(m_Options.TempDir, {})) - { - std::error_code DummyEc; - RemoveDir(m_Options.TempDir, DummyEc); - } - }); + auto _ = MakeGuard([&]() { CleanAndRemoveDirectory(m_IOWorkerPool, m_AbortFlag, m_PauseFlag, m_Options.TempDir); }); m_LogOutput.SetLogOperationProgress(TaskSteps::PrepareBuild, TaskSteps::StepCount); @@ -6915,14 +6909,9 @@ BuildsOperationValidateBuildPart::Execute() const std::filesystem::path TempFolder = ".zen-tmp"; + CleanAndRemoveDirectory(m_IOWorkerPool, m_AbortFlag, m_PauseFlag, TempFolder); CreateDirectories(TempFolder); - auto __ = MakeGuard([&TempFolder]() { - if (CleanDirectory(TempFolder, {})) - { - std::error_code DummyEc; - RemoveDir(TempFolder, DummyEc); - } - }); + auto __ = MakeGuard([this, TempFolder]() { CleanAndRemoveDirectory(m_IOWorkerPool, m_AbortFlag, m_PauseFlag, TempFolder); }); m_LogOutput.SetLogOperationProgress(TaskSteps::ValidateBlobs, TaskSteps::StepCount); diff --git a/src/zenremotestore/filesystemutils.cpp b/src/zenremotestore/filesystemutils.cpp index 20ab3faea..8dff05c6b 100644 --- a/src/zenremotestore/filesystemutils.cpp +++ b/src/zenremotestore/filesystemutils.cpp @@ -1,6 +1,6 @@ // Copyright Epic Games, Inc. All Rights Reserved. -#include "filesystemutils.h" +#include <zenremotestore/filesystemutils.h> #include <zenremotestore/chunking/chunkedcontent.h> @@ -215,11 +215,11 @@ SetFileReadOnlyWithRetry(const std::filesystem::path& Path, bool ReadOnly) bool Result = SetFileReadOnly(Path, ReadOnly, Ec); for (size_t Retries = 0; Ec && Retries < 3; Retries++) { - Sleep(100 + int(Retries * 50)); if (!IsFileWithRetry(Path)) { return false; } + Sleep(100 + int(Retries * 50)); Ec.clear(); Result = SetFileReadOnly(Path, ReadOnly, Ec); } @@ -277,11 +277,11 @@ RemoveFileWithRetry(const std::filesystem::path& Path) RemoveFile(Path, Ec); for (size_t Retries = 0; Ec && Retries < 6; Retries++) { - Sleep(100 + int(Retries * 50)); if (!IsFileWithRetry(Path)) { return; } + Sleep(100 + int(Retries * 50)); Ec.clear(); RemoveFile(Path, Ec); } @@ -426,12 +426,13 @@ CleanDirectory( (void)SetFileReadOnly(FilePath, false, Ec); for (size_t Retries = 0; Ec && Retries < 3; Retries++) { - Sleep(100 + int(Retries * 50)); if (!IsFileWithRetry(FilePath)) { IsRemoved = true; + Ec.clear(); break; } + Sleep(100 + int(Retries * 50)); Ec.clear(); (void)SetFileReadOnly(FilePath, false, Ec); } @@ -440,12 +441,13 @@ CleanDirectory( (void)RemoveFile(FilePath, Ec); for (size_t Retries = 0; Ec && Retries < 6; Retries++) { - Sleep(100 + int(Retries * 50)); if (!IsFileWithRetry(FilePath)) { IsRemoved = true; + Ec.clear(); return; } + Sleep(100 + int(Retries * 50)); Ec.clear(); (void)RemoveFile(FilePath, Ec); } @@ -542,25 +544,27 @@ CleanDirectory( { std::error_code Ec; - zen::CleanDirectory(DirectoryToDelete, true, Ec); + zen::CleanDirectory(DirectoryToDelete, /*ForceRemoveReadOnlyFiles*/ true, Ec); if (Ec) { Sleep(200); - zen::CleanDirectory(DirectoryToDelete, true, Ec); + Ec.clear(); + zen::CleanDirectory(DirectoryToDelete, /*ForceRemoveReadOnlyFiles*/ true, Ec); } if (!Ec) { - RemoveDir(Path, Ec); + RemoveDir(DirectoryToDelete, Ec); for (size_t Retries = 0; Ec && Retries < 3; Retries++) { - Sleep(100 + int(Retries * 50)); - if (!IsDir(Path)) + if (!IsDir(DirectoryToDelete)) { + Ec.clear(); break; } + Sleep(100 + int(Retries * 50)); Ec.clear(); - RemoveDir(Path, Ec); + RemoveDir(DirectoryToDelete, Ec); } } if (Ec) @@ -592,4 +596,33 @@ CleanDirectory( return Result; } +bool +CleanAndRemoveDirectory(WorkerThreadPool& WorkerPool, + std::atomic<bool>& AbortFlag, + std::atomic<bool>& PauseFlag, + const std::filesystem::path& Directory) +{ + if (!IsDir(Directory)) + { + return true; + } + if (CleanDirectoryResult Res = CleanDirectory( + WorkerPool, + AbortFlag, + PauseFlag, + Directory, + {}, + [](const std::string_view Details, uint64_t TotalCount, uint64_t RemainingCount, bool IsPaused, bool IsAborted) { + ZEN_UNUSED(Details, TotalCount, RemainingCount, IsPaused, IsAborted); + }, + 1000); + Res.FailedRemovePaths.empty()) + { + std::error_code Ec; + RemoveDir(Directory, Ec); + return !Ec; + } + return false; +} + } // namespace zen diff --git a/src/zenremotestore/filesystemutils.h b/src/zenremotestore/include/zenremotestore/filesystemutils.h index cfe6adc6c..a6c88e5cb 100644 --- a/src/zenremotestore/filesystemutils.h +++ b/src/zenremotestore/include/zenremotestore/filesystemutils.h @@ -111,4 +111,9 @@ CleanDirectoryResult CleanDirectory( ProgressFunc, uint32_t ProgressUpdateDelayMS); +bool CleanAndRemoveDirectory(WorkerThreadPool& WorkerPool, + std::atomic<bool>& AbortFlag, + std::atomic<bool>& PauseFlag, + const std::filesystem::path& Directory); + } // namespace zen |