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

Unlock output paths when a derivation is already built

Browse source 
Without this change, nix build processes will not drop the locks for derivation goals
which have already been built by another process when the current process gets
round to building them. This means the locks are held until the process
terminates.

If there are other nix build processes in a similar state, they will also try to
acquire the same locks when they try to build the same derivation, and so will
wait until the lock holder terminates (which might be a very long time if it has
a lot to build). In some pathological cases, those processes might be holding
their own locks on other derivations due to the same issue, and this can lead to
deadlock.

Resolves #6468
This commit is contained in:
Graham Bennett 2022-04-29 15:15:25 -04:00 committed by Graham Bennett
parent 2cdc9c32e7
commit 82ddb13098
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libstore/build/derivation-goal.cc
View file

@ -1456,6 +1456,7 @@ void DerivationGoal::done(
SingleDrvOutputs builtOutputs, SingleDrvOutputs builtOutputs,
std::optional<Error> ex) std::optional<Error> ex)
{ {
outputLocks.unlock();
buildResult.status = status; buildResult.status = status;
if (ex) if (ex)
buildResult.errorMsg = fmt("%s", normaltxt(ex->info().msg)); buildResult.errorMsg = fmt("%s", normaltxt(ex->info().msg));