max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-10 16:26:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Skip deletion of lower paths for overlay store GC.

Browse source
This commit is contained in:
Ben Radford 2023-05-24 11:26:33 +01:00 committed by Ben Radford
parent 98edbb9686
commit a48acfd684
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libstore/local-overlay-store.cc
View file

@ -182,7 +182,7 @@ void LocalOverlayStore::addToStore(const ValidPathInfo & info, Source & source,
LocalStore::addToStore(info, source, repair, checkSigs); LocalStore::addToStore(info, source, repair, checkSigs);
if (lowerStore->isValidPath(info.path)) { if (lowerStore->isValidPath(info.path)) {
// dedup stores // dedup stores
deletePath(toUpperPath(info.path)); deletePath(toUpperPath(info.path)); // TODO: Investigate whether this can trigger 'stale file handle' errors.
} }
} }
@ -214,6 +214,18 @@ StorePath LocalOverlayStore::addTextToStore(
} }
void LocalOverlayStore::deleteGCPath(const Path & path, uint64_t & bytesFreed)
{
auto mergedDir = realStoreDir.get() + "/";
if (path.substr(0, mergedDir.length()) != mergedDir) {
warn("local-overlay: unexpected gc path '%s' ", path);
return;
}
if (pathExists(toUpperPath({path.substr(mergedDir.length())}))) {
GcStore::deleteGCPath(path, bytesFreed);
}
}
static RegisterStoreImplementation<LocalOverlayStore, LocalOverlayStoreConfig> regLocalOverlayStore; static RegisterStoreImplementation<LocalOverlayStore, LocalOverlayStoreConfig> regLocalOverlayStore;
} }

2
src/libstore/local-overlay-store.hh
View file

@ -122,6 +122,8 @@ private:
void queryRealisationUncached(const DrvOutput&, void queryRealisationUncached(const DrvOutput&,
Callback<std::shared_ptr<const Realisation>> callback) noexcept override; Callback<std::shared_ptr<const Realisation>> callback) noexcept override;
void deleteGCPath(const Path & path, uint64_t & bytesFreed) override;
}; };
} }