Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport issue 3964 substitution loop #4389

Merged
merged 3 commits into from
Dec 25, 2020
Merged

Backport issue 3964 substitution loop #4389

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c29fffe
DerivationGoal: only retry if output closure incomplete is only problem
roberth Oct 18, 2020
e90530e
Tests for #3964
roberth Oct 17, 2020
8388e2e
Revert "Tests for #3964"
roberth Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/libstore/build.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1222,8 +1222,13 @@ void DerivationGoal::outputsSubstituted()

/* If the substitutes form an incomplete closure, then we should
build the dependencies of this derivation, but after that, we
can still use the substitutes for this derivation itself. */
if (nrIncompleteClosure > 0) retrySubstitution = true;
can still use the substitutes for this derivation itself.

If the nrIncompleteClosure != nrFailed, we have another issue as well.
In particular, it may be the case that the hole in the closure is
an output of the current derivation, which causes a loop if retried.
*/
if (nrIncompleteClosure > 0 && nrIncompleteClosure == nrFailed) retrySubstitution = true;

nrFailed = nrNoSubstituters = nrIncompleteClosure = 0;

Expand Down