ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #1126 from DeterminateSystems/build-localhost-paths

Browse Source 
build-remote: copy missing paths from the binary cache to localhost
This commit is contained in:
Graham Christensen
2022-01-21 16:16:33 -05:00
committed by GitHub
parent 44cd890ae3 ba96a13407
commit c280692f91
7 changed files with 101 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/hydra-queue-runner/build-remote.cc
View File

@ -270,17 +270,24 @@ void State::buildRemote(ref<Store> destStore,
copyPaths(*localStore, *destStore, closure, NoRepair, NoCheckSigs, NoSubstitute);
}
/* Copy the input closure. */
if (!machine->isLocalhost()) {
{
auto mc1 = std::make_shared<MaintainCount<counter>>(nrStepsWaiting);
mc1.reset();
MaintainCount<counter> mc2(nrStepsCopyingTo);
printMsg(lvlDebug, "sending closure of ‘%s’ to ‘%s’",
localStore->printStorePath(step->drvPath), machine->sshName);
auto now1 = std::chrono::steady_clock::now();
copyClosureTo(machine->state->sendLock, destStore, from, to, inputs, true);
/* Copy the input closure. */
if (machine->isLocalhost()) {
StorePathSet closure;
destStore->computeFSClosure(inputs, closure);
copyPaths(*destStore, *localStore, closure, NoRepair, NoCheckSigs, NoSubstitute);
} else {
copyClosureTo(machine->state->sendLock, destStore, from, to, inputs, true);
}
auto now2 = std::chrono::steady_clock::now();