diff options
| author | Dan Engelbrecht <[email protected]> | 2025-09-30 22:03:44 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-09-30 22:03:44 +0200 |
| commit | 847790afca7ddee5fbf3998df3b86521a8eb8192 (patch) | |
| tree | c4eaac78eac27ff0c42bdb1c63fd0c18f8c4af34 | |
| parent | projectstore refactor (#531) (diff) | |
| download | zen-847790afca7ddee5fbf3998df3b86521a8eb8192.tar.xz zen-847790afca7ddee5fbf3998df3b86521a8eb8192.zip | |
skip dropped oplogs in ScanForOplogs() (#534)
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | src/zenserver/projectstore/projectstore.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a5a3b03b2..dcd6acb8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## - Bugfix: Parsing of `zen builds` `--log-progress` option fixed - Bugfix: Rebuild State phase of `zen builds download` could read out of bound for target path array +- Bugfix: Don't include oplogs pending delete when scanning for oplogs ## 5.7.3 - Feature: `zen builds download` and `zen builds ls` now allows multiple wildcards for `--wildcard` and `--exclude-wildcard` separated by semicolons (;) diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp index cf30f32e0..c83ec808c 100644 --- a/src/zenserver/projectstore/projectstore.cpp +++ b/src/zenserver/projectstore/projectstore.cpp @@ -3978,6 +3978,11 @@ ProjectStore::Project::ScanForOplogs() const Oplogs.reserve(DirContent.Directories.size()); for (const std::filesystem::path& DirPath : DirContent.Directories) { + std::string DirName = PathToUtf8(DirPath.filename()); + if (DirName.starts_with("[dropped]")) + { + continue; + } if (Oplog::ExistsAt(DirPath)) { Oplogs.push_back(DirPath.filename().string()); |