lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Get rid of "will retry" messages after "maybe cancelling..."

Browse source
This commit is contained in:
Eelco Dolstra 2016-03-08 13:09:39 +01:00
parent 718fef29ef
commit b77a43b83d
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/hydra-queue-runner/builder.cc
View file

@ -8,7 +8,7 @@ using namespace nix;
void State::builder(MachineReservation::ptr reservation) void State::builder(MachineReservation::ptr reservation)
{ {
bool retry = true; StepResult res = sRetry;
nrStepsStarted++; nrStepsStarted++;
@ -18,7 +18,7 @@ void State::builder(MachineReservation::ptr reservation)
try { try {
auto destStore = getDestStore(); auto destStore = getDestStore();
retry = doBuildStep(destStore, step, reservation->machine); res = doBuildStep(destStore, step, reservation->machine);
} catch (std::exception & e) { } catch (std::exception & e) {
printMsg(lvlError, format("uncaught exception building ‘%1%’ on ‘%2%’: %3%") printMsg(lvlError, format("uncaught exception building ‘%1%’ on ‘%2%’: %3%")
% step->drvPath % reservation->machine->sshName % e.what()); % step->drvPath % reservation->machine->sshName % e.what());
@ -31,8 +31,8 @@ void State::builder(MachineReservation::ptr reservation)
/* If there was a temporary failure, retry the step after an /* If there was a temporary failure, retry the step after an
exponentially increasing interval. */ exponentially increasing interval. */
if (retry) { if (res != sDone) {
{ if (res == sRetry) {
auto step_(step->state.lock()); auto step_(step->state.lock());
step_->tries++; step_->tries++;
nrRetries++; nrRetries++;
@ -47,7 +47,7 @@ void State::builder(MachineReservation::ptr reservation)
} }
bool State::doBuildStep(nix::ref<Store> destStore, Step::ptr step, State::StepResult State::doBuildStep(nix::ref<Store> destStore, Step::ptr step,
Machine::ptr machine) Machine::ptr machine)
{ {
{ {
@ -81,7 +81,7 @@ bool State::doBuildStep(nix::ref<Store> destStore, Step::ptr step,
the runnable queue). If there are really no strong the runnable queue). If there are really no strong
pointers to the step, it will be deleted. */ pointers to the step, it will be deleted. */
printMsg(lvlInfo, format("maybe cancelling build step ‘%1%’") % step->drvPath); printMsg(lvlInfo, format("maybe cancelling build step ‘%1%’") % step->drvPath);
return true; return sMaybeCancelled;
} }
for (auto build2 : dependents) for (auto build2 : dependents)
@ -174,7 +174,7 @@ bool State::doBuildStep(nix::ref<Store> destStore, Step::ptr step,
stepNr, machine->sshName, bssAborted, result.errorMsg); stepNr, machine->sshName, bssAborted, result.errorMsg);
txn.commit(); txn.commit();
if (quit) exit(1); if (quit) exit(1);
return true; return sRetry;
} }
} }
@ -400,5 +400,5 @@ bool State::doBuildStep(nix::ref<Store> destStore, Step::ptr step,
if (quit) exit(0); // testing hack if (quit) exit(0); // testing hack
return false; return sDone;
} }

5
src/hydra-queue-runner/state.hh
View file

@ -425,8 +425,9 @@ private:
/* Perform the given build step. Return true if the step is to be /* Perform the given build step. Return true if the step is to be
retried. */ retried. */
bool doBuildStep(nix::ref<nix::Store> destStore, Step::ptr step, enum StepResult { sDone, sRetry, sMaybeCancelled };
Machine::ptr machine); StepResult doBuildStep(nix::ref<nix::Store> destStore,
Step::ptr step, Machine::ptr machine);
void buildRemote(nix::ref<nix::Store> destStore, void buildRemote(nix::ref<nix::Store> destStore,
Machine::ptr machine, Step::ptr step, Machine::ptr machine, Step::ptr step,