maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix-store --verify: Add an option ‘--repair’ to repair all missing/corrupt paths

Browse source 
Also, return a non-zero exit code if errors remain after
verifying/repairing.
This commit is contained in:
Eelco Dolstra 2012-10-02 15:04:59 -04:00
parent 9958bd6992
commit 8e3a7bd712
4 changed files with 42 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/libstore/local-store.cc
View file

@ -1544,10 +1544,12 @@ void LocalStore::invalidatePathChecked(const Path & path)
}
void LocalStore::verifyStore(bool checkContents)
bool LocalStore::verifyStore(bool checkContents, bool repair)
{
printMsg(lvlError, format("reading the Nix store..."));
bool errors = false;
/* Acquire the global GC lock to prevent a garbage collection. */
AutoCloseFD fdGCLock = openGCLock(ltWrite);
@ -1560,7 +1562,7 @@ void LocalStore::verifyStore(bool checkContents)
PathSet validPaths2 = queryAllValidPaths(), validPaths, done;
foreach (PathSet::iterator, i, validPaths2)
verifyPath(*i, store, done, validPaths);
verifyPath(*i, store, done, validPaths, repair, errors);
/* Release the GC lock so that checking content hashes (which can
take ages) doesn't block the GC or builds. */
@ -1584,6 +1586,7 @@ void LocalStore::verifyStore(bool checkContents)
printMsg(lvlError, format("path `%1%' was modified! "
"expected hash `%2%', got `%3%'")
% *i % printHash(info.hash) % printHash(current.first));
if (repair) repairPath(*i); else errors = true;
} else {
bool update = false;
@ -1611,14 +1614,17 @@ void LocalStore::verifyStore(bool checkContents)
errors on invalid paths. */
if (isValidPath(*i)) throw;
printMsg(lvlError, format("warning: %1%") % e.msg());
errors = true;
}
}
}
return errors;
}
void LocalStore::verifyPath(const Path & path, const PathSet & store,
PathSet & done, PathSet & validPaths)
PathSet & done, PathSet & validPaths, bool repair, bool & errors)
{
checkInterrupt();
@ -1638,7 +1644,7 @@ void LocalStore::verifyPath(const Path & path, const PathSet & store,
PathSet referrers; queryReferrers(path, referrers);
foreach (PathSet::iterator, i, referrers)
if (*i != path) {
verifyPath(*i, store, done, validPaths);
verifyPath(*i, store, done, validPaths, repair, errors);
if (validPaths.find(*i) != validPaths.end())
canInvalidate = false;
}
@ -1646,8 +1652,17 @@ void LocalStore::verifyPath(const Path & path, const PathSet & store,
if (canInvalidate) {
printMsg(lvlError, format("path `%1%' disappeared, removing from database...") % path);
invalidatePath(path);
} else
} else {
printMsg(lvlError, format("path `%1%' disappeared, but it still has valid referrers!") % path);
if (repair)
try {
repairPath(path);
} catch (Error & e) {
printMsg(lvlError, format("warning: %1%") % e.msg());
errors = true;
}
else errors = true;
}
return;
}