snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Disambiguate "marking build as succeeded" message

Browse source
This commit is contained in:
Eelco Dolstra 2016-04-13 13:42:05 +02:00
parent ad834343b5
commit 00c78440b1
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -225,9 +225,11 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore, Step::ptr step,
finishBuildStep(txn, result.startTime, result.stopTime, result.overhead,
build->id, stepNr, machine->sshName, bsSuccess);
for (auto & b : direct)
for (auto & b : direct) {
printMsg(lvlInfo, format("marking build %1% as succeeded") % b->id);
markSucceededBuild(txn, b, res, build != b || result.isCached,
result.startTime, result.stopTime);
}
txn.commit();
}

2
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -353,8 +353,6 @@ void visitDependencies(std::function<void(Step::ptr)> visitor, Step::ptr start)
void State::markSucceededBuild(pqxx::work & txn, Build::ptr build,
const BuildOutput & res, bool isCachedBuild, time_t startTime, time_t stopTime)
{
printMsg(lvlInfo, format("marking build %1% as succeeded") % build->id);
if (build->finishedInDB) return;
if (txn.parameterized("select 1 from Builds where id = $1 and finished = 0")(build->id).exec().empty()) return;

1
src/hydra-queue-runner/queue-monitor.cc
View file

@ -165,6 +165,7 @@ bool State::getQueuedBuilds(Connection & conn, ref<Store> localStore,
auto mc = startDbUpdate();
pqxx::work txn(conn);
time_t now = time(0);
printMsg(lvlInfo, format("marking build %1% as succeeded (cached)") % build->id);
markSucceededBuild(txn, build, res, true, now, now);
txn.commit();
}