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

libstore: clear derivation build activities when done

Browse source 
without this derivations do not show as completely processed in the
internal-json logs (or the newer multiline output). the former also
breaks external tools like nix-output-monitor which, like multiline
output, grow vertically until at least some goals are finally freed

Change-Id: I55758daf526ba29ae15fb82e0d88da8afb45bf5c
This commit is contained in:
eldritch horrors 2024-10-21 18:17:58 +02:00
parent 5ce1d8463a
commit 343aca3a27
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -127,7 +127,11 @@ Goal::WorkResult DerivationGoal::timedOut(Error && ex)
kj::Promise<Result<Goal::WorkResult>> DerivationGoal::workImpl() noexcept kj::Promise<Result<Goal::WorkResult>> DerivationGoal::workImpl() noexcept
{ {
return useDerivation ? getDerivation() : haveDerivation(); return (useDerivation ? getDerivation() : haveDerivation()).attach(kj::defer([this] {
act.reset();
actLock.reset();
builderActivities.clear();
}));
} }
bool DerivationGoal::addWantedOutputs(const OutputsSpec & outputs) bool DerivationGoal::addWantedOutputs(const OutputsSpec & outputs)