bbjubjub2494/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Make the garbage collector more resilient to certain consistency

Browse source 
errors: in-use paths now cause a warning, not a fatal error.
This commit is contained in:
Eelco Dolstra 2007-01-14 16:24:49 +00:00
parent 8659edc098
commit 8f67b35886
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/gc.cc
View file

@ -599,9 +599,13 @@ void LocalStore::collectGarbage(GCAction action, const PathSet & pathsToDelete,
printMsg(lvlInfo, format("deleting `%1%'") % *i); printMsg(lvlInfo, format("deleting `%1%'") % *i);
/* Okay, it's safe to delete. */ /* Okay, it's safe to delete. */
try {
unsigned long long freed; unsigned long long freed;
deleteFromStore(*i, freed); deleteFromStore(*i, freed);
bytesFreed += freed; bytesFreed += freed;
} catch (PathInUse & e) {
printMsg(lvlError, format("warning: %1%") % e.msg());
}
#ifndef __CYGWIN__ #ifndef __CYGWIN__
if (fdLock != -1) if (fdLock != -1)

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

@ -709,7 +709,7 @@ void deleteFromStore(const Path & _path, unsigned long long & bytesFreed)
for (PathSet::iterator i = referrers.begin(); for (PathSet::iterator i = referrers.begin();
i != referrers.end(); ++i) i != referrers.end(); ++i)
if (*i != path && isValidPathTxn(txn, *i)) if (*i != path && isValidPathTxn(txn, *i))
throw Error(format("cannot delete path `%1%' because it is in use by path `%2%'") % path % *i); throw PathInUse(format("cannot delete path `%1%' because it is in use by path `%2%'") % path % *i);
invalidatePath(txn, path); invalidatePath(txn, path);
} }
txn.commit(); txn.commit();

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

@ -138,6 +138,8 @@ Path queryDeriver(const Transaction & txn, const Path & path);
/* Delete a value from the nixStore directory. */ /* Delete a value from the nixStore directory. */
void deleteFromStore(const Path & path, unsigned long long & bytesFreed); void deleteFromStore(const Path & path, unsigned long long & bytesFreed);
MakeError(PathInUse, Error);
void verifyStore(bool checkContents); void verifyStore(bool checkContents);
/* Whether we are in build users mode. */ /* Whether we are in build users mode. */