nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-02-16 17:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11922 from picnoir/pic/catch-gc-exception

Browse Source 
gc: resume GC after a pathinuse error
This commit is contained in:
Jörg Thalheim 2024-11-20 16:31:20 +01:00 committed by GitHub
commit c13c6066b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libstore/gc.cc
View File

@ -4,6 +4,7 @@
#include "finally.hh" #include "finally.hh"
#include "unix-domain-socket.hh" #include "unix-domain-socket.hh"
#include "signals.hh" #include "signals.hh"
#include "posix-fs-canonicalise.hh"
#if !defined(__linux__) #if !defined(__linux__)
// For shelling out to lsof // For shelling out to lsof
@ -763,13 +764,18 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
} }
} }
} }
for (auto & path : topoSortPaths(visited)) { for (auto & path : topoSortPaths(visited)) {
if (!dead.insert(path).second) continue; if (!dead.insert(path).second) continue;
if (shouldDelete) { if (shouldDelete) {
invalidatePathChecked(path); try {
deleteFromStore(path.to_string()); invalidatePathChecked(path);
referrersCache.erase(path); deleteFromStore(path.to_string());
referrersCache.erase(path);
} catch (PathInUse &e) {
// If we end up here, it's likely a new occurence
// of https://github.com/NixOS/nix/issues/11923
printError("BUG: %s", e.what());
}
} }
} }
}; };