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

Remove TokenServer in preparation of making NAR copying O(1) memory

Browse Source
This commit is contained in:
Eelco Dolstra
2020-07-27 14:57:16 +02:00
parent e5f6fc2e4e
commit cbcf6359b4
6 changed files with 1 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/hydra-queue-runner/builder.cc
View File

@ -204,8 +204,6 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
try {
/* FIXME: referring builds may have conflicting timeouts. */
buildRemote(destStore, machine, step, maxSilentTime, buildTimeout, repeats, result, activeStep, updateStep);
} catch (NoTokens & e) {
result.stepStatus = bsNarSizeLimitExceeded;
} catch (Error & e) {
if (activeStep->state_.lock()->cancelled) {
printInfo("marking step %d of build %d as cancelled", stepNr, buildId);
@ -224,7 +222,6 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
}
result.accessor = 0;
result.tokens = 0;
}
time_t stepStopTime = time(0);