Merge pull request #12160 from Mic92/deadlock

edolstra · web-flow · commit 9b9e4168361f · 2025-01-09T16:54:23.000+01:00
derivation-goal: unlock output lock to avoid deadlock
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc
@@ -701,6 +701,7 @@ Goal::Co DerivationGoal::tryToBuild()
     if (buildMode != bmCheck && allValid) {
         debug("skipping build of derivation '%s', someone beat us to it", worker.store.printStorePath(drvPath));
         outputLocks.setDeletion(true);
+        outputLocks.unlock();
         co_return done(BuildResult::AlreadyValid, std::move(validOutputs));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -701,6 +701,7 @@ Goal::Co DerivationGoal::tryToBuild()`
`701`	`701`	`if (buildMode != bmCheck && allValid) {`
`702`	`702`	`debug("skipping build of derivation '%s', someone beat us to it", worker.store.printStorePath(drvPath));`
`703`	`703`	`outputLocks.setDeletion(true);`
	`704`	`+ outputLocks.unlock();`
`704`	`705`	`co_return done(BuildResult::AlreadyValid, std::move(validOutputs));`
`705`	`706`	`}`
`706`	`707`