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

Move log compression to a plugin

Browse Source
This commit is contained in:
Eelco Dolstra
2017-03-13 17:18:22 +01:00
parent 285754aff6
commit 7e6486e694
4 changed files with 27 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,6 +146,13 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
auto orphanedSteps_(orphanedSteps.lock());
orphanedSteps_->emplace(buildId, stepNr);
}
if (stepNr) {
/* Asynchronously run plugins. FIXME: if we're killed,
plugin actions might not be run. Need to ensure
at-least-once semantics. */
enqueueNotificationItem({NotificationItem::Type::StepFinished, buildId, {}, stepNr, result.logFile});
}
});
time_t stepStartTime = result.startTime = time(0);
@ -205,16 +212,6 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
}
}
/* Asynchronously compress the log. */
if (result.logFile != "") {
{
auto logCompressorQueue_(logCompressorQueue.lock());
assert(stepNr);
logCompressorQueue_->push({buildId, stepNr, result.logFile});
}
logCompressorWakeup.notify_one();
}
/* The step had a hopefully temporary failure (e.g. network
issue). Retry a number of times. */
if (result.canRetry) {
@ -446,7 +443,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
machine->state->totalStepTime += stepStopTime - stepStartTime;
machine->state->totalStepBuildTime += result.stopTime - result.startTime;
if (quit) exit(0); // testing hack
if (quit) exit(0); // testing hack; FIXME: this won't run plugins
return sDone;
}