From b77a43b83d66d1b33fef3a97142f2104f07eb8c6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Mar 2016 13:09:39 +0100
Subject: [PATCH] Get rid of "will retry" messages after "maybe cancelling..."
---
src/hydra-queue-runner/builder.cc | 16 ++++++++--------
src/hydra-queue-runner/state.hh | 5 +++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/hydra-queue-runner/builder.cc b/src/hydra-queue-runner/builder.cc
index e8f06570..a338ba0e 100644
--- a/src/hydra-queue-runner/builder.cc
+++ b/src/hydra-queue-runner/builder.cc
@@ -8,7 +8,7 @@ using namespace nix;
void State::builder(MachineReservation::ptr reservation)
{
- bool retry = true;
+ StepResult res = sRetry;
nrStepsStarted++;
@@ -18,7 +18,7 @@ void State::builder(MachineReservation::ptr reservation)
try {
auto destStore = getDestStore();
- retry = doBuildStep(destStore, step, reservation->machine);
+ res = doBuildStep(destStore, step, reservation->machine);
} catch (std::exception & e) {
printMsg(lvlError, format("uncaught exception building ‘%1%’ on ‘%2%’: %3%")
% 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
exponentially increasing interval. */
- if (retry) {
- {
+ if (res != sDone) {
+ if (res == sRetry) {
auto step_(step->state.lock());
step_->tries++;
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)
{
{
@@ -81,7 +81,7 @@ bool State::doBuildStep(nix::ref<Store> destStore, Step::ptr step,
the runnable queue). If there are really no strong
pointers to the step, it will be deleted. */
printMsg(lvlInfo, format("maybe cancelling build step ‘%1%’") % step->drvPath);
- return true;
+ return sMaybeCancelled;
}
for (auto build2 : dependents)
@@ -174,7 +174,7 @@ bool State::doBuildStep(nix::ref<Store> destStore, Step::ptr step,
stepNr, machine->sshName, bssAborted, result.errorMsg);
txn.commit();
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
- return false;
+ return sDone;
}
diff --git a/src/hydra-queue-runner/state.hh b/src/hydra-queue-runner/state.hh
index 35f84209..d6ad1ccb 100644
--- a/src/hydra-queue-runner/state.hh
+++ b/src/hydra-queue-runner/state.hh
@@ -425,8 +425,9 @@ private:
/* Perform the given build step. Return true if the step is to be
retried. */
- bool doBuildStep(nix::ref<nix::Store> destStore, Step::ptr step,
- Machine::ptr machine);
+ enum StepResult { sDone, sRetry, sMaybeCancelled };
+ StepResult doBuildStep(nix::ref<nix::Store> destStore,
+ Step::ptr step, Machine::ptr machine);
void buildRemote(nix::ref<nix::Store> destStore,
Machine::ptr machine, Step::ptr step,