lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* When there are multiple substituters, make sure to release the

Browse source 
lock on the output path after trying each.  Otherwise the
  pathIsLockedByMe() test gets confused.
This commit is contained in:
Eelco Dolstra 2007-08-28 16:22:08 +00:00
parent c970b28ba0
commit cb1c1004cd
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/build.cc
View file

@ -1310,6 +1310,10 @@ DerivationGoal::PrepareBuildReply DerivationGoal::prepareBuild()
/* Obtain locks on all output paths. The locks are automatically /* Obtain locks on all output paths. The locks are automatically
released when we exit this function or Nix crashes. */ released when we exit this function or Nix crashes. */
/* !!! BUG: this could block, which is not allowed. */ /* !!! BUG: this could block, which is not allowed. */
/* !!! and once we make this non-blocking, we should carefully
consider the case where some but not all locks are required; we
should then release the acquired locks so that the other
processes and the pathIsLockedByMe() test don't get confused. */
outputLocks.lockPaths(outputPaths(drv.outputs), outputLocks.lockPaths(outputPaths(drv.outputs),
(format("waiting for lock on %1%") % showPaths(outputPaths(drv.outputs))).str()); (format("waiting for lock on %1%") % showPaths(outputPaths(drv.outputs))).str());
@ -2080,6 +2084,7 @@ void SubstitutionGoal::tryToRun()
/* Maybe a derivation goal has already locked this path /* Maybe a derivation goal has already locked this path
(exceedingly unlikely, since it should have used a substitute (exceedingly unlikely, since it should have used a substitute
first, but let's be defensive). */ first, but let's be defensive). */
outputLock.reset(); // make sure this goal's lock is gone
if (pathIsLockedByMe(storePath)) { if (pathIsLockedByMe(storePath)) {
debug(format("restarting substitution of `%1%' because it's locked by another goal") debug(format("restarting substitution of `%1%' because it's locked by another goal")
% storePath); % storePath);