vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Build the resolved derivation and not the original one

Browse source
This commit is contained in:
Théophane Hufschmitt 2022-03-24 14:27:45 +01:00
parent 92b627ac1b
commit 6e571e26ff
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/hydra-queue-runner/build-remote.cc
View file

@ -203,7 +203,7 @@ void handshake(Machine::Connection & conn, unsigned int repeats)
throw Error("machine ‘%1%’ does not support repeating a build; please upgrade it to Nix 1.12", conn.machine->sshName); throw Error("machine ‘%1%’ does not support repeating a build; please upgrade it to Nix 1.12", conn.machine->sshName);
} }
StorePathSet sendInputs( BasicDerivation sendInputs(
State & state, State & state,
Step & step, Step & step,
Store & localStore, Store & localStore,
@ -214,19 +214,13 @@ StorePathSet sendInputs(
counter & nrStepsCopyingTo counter & nrStepsCopyingTo
) )
{ {
StorePathSet inputs;
BasicDerivation basicDrv(*step.drv); BasicDerivation basicDrv(*step.drv);
for (auto & p : step.drv->inputSrcs)
inputs.insert(p);
for (auto & input : step.drv->inputDrvs) { for (auto & input : step.drv->inputDrvs) {
auto drv2 = localStore.readDerivation(input.first); auto drv2 = localStore.readDerivation(input.first);
for (auto & name : input.second) { for (auto & name : input.second) {
if (auto i = get(drv2.outputs, name)) { if (auto i = get(drv2.outputs, name)) {
auto outPath = i->path(localStore, drv2.name, name); auto outPath = i->path(localStore, drv2.name, name);
inputs.insert(*outPath);
basicDrv.inputSrcs.insert(*outPath); basicDrv.inputSrcs.insert(*outPath);
} }
} }
@ -255,10 +249,10 @@ StorePathSet sendInputs(
/* Copy the input closure. */ /* Copy the input closure. */
if (conn.machine->isLocalhost()) { if (conn.machine->isLocalhost()) {
StorePathSet closure; StorePathSet closure;
destStore.computeFSClosure(inputs, closure); destStore.computeFSClosure(basicDrv.inputSrcs, closure);
copyPaths(destStore, localStore, closure, NoRepair, NoCheckSigs, NoSubstitute); copyPaths(destStore, localStore, closure, NoRepair, NoCheckSigs, NoSubstitute);
} else { } else {
copyClosureTo(conn.machine->state->sendLock, destStore, conn.from, conn.to, inputs, true); copyClosureTo(conn.machine->state->sendLock, destStore, conn.from, conn.to, basicDrv.inputSrcs, true);
} }
auto now2 = std::chrono::steady_clock::now(); auto now2 = std::chrono::steady_clock::now();
@ -266,7 +260,7 @@ StorePathSet sendInputs(
overhead += std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1).count(); overhead += std::chrono::duration_cast<std::chrono::milliseconds>(now2 - now1).count();
} }
return inputs; return basicDrv;
} }
void RemoteResult::updateWithBuildResult(const nix::BuildResult & buildResult) void RemoteResult::updateWithBuildResult(const nix::BuildResult & buildResult)
@ -535,8 +529,7 @@ void State::buildRemote(ref<Store> destStore,
copy the immediate sources of the derivation and the required copy the immediate sources of the derivation and the required
outputs of the input derivations. */ outputs of the input derivations. */
updateStep(ssSendingInputs); updateStep(ssSendingInputs);
BasicDerivation resolvedDrv = sendInputs(*this, *step, *localStore, *destStore, conn, result.overhead, nrStepsWaiting, nrStepsCopyingTo);
StorePathSet inputs = sendInputs(*this, *step, *localStore, *destStore, conn, result.overhead, nrStepsWaiting, nrStepsCopyingTo);
logFileDel.cancel(); logFileDel.cancel();
@ -561,7 +554,7 @@ void State::buildRemote(ref<Store> destStore,
conn, conn,
*localStore, *localStore,
step->drvPath, step->drvPath,
BasicDerivation(*step->drv), resolvedDrv,
buildOptions, buildOptions,
nrStepsBuilding nrStepsBuilding
); );