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

Immediately abort builds that require an unsupported system type

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-15 14:51:49 +02:00
parent bf87d3a6ed
commit 541fbd62cc
1 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -128,6 +128,13 @@ struct Machine
auto currentJobs_(currentJobs.lock());
*currentJobs_ = 0;
}
bool supportsStep(Step::ptr step)
{
if (systemTypes.find(step->drv.platform) == systemTypes.end()) return false;
// FIXME: check features
return true;
}
};
@ -452,7 +459,7 @@ void State::getQueuedBuilds(Connection & conn, std::shared_ptr<StoreAPI> store,
if (!store->isValidPath(build->drvPath)) {
/* Derivation has been GC'ed prematurely. */
printMsg(lvlInfo, format("aborting GC'ed build %1%") % build->id);
printMsg(lvlError, format("aborting GC'ed build %1%") % build->id);
pqxx::work txn(conn);
txn.parameterized
("update Builds set finished = 1, busy = 0, buildStatus = $2, startTime = $3, stopTime = $3, errorMsg = $4 where id = $1")
@ -483,6 +490,32 @@ void State::getQueuedBuilds(Connection & conn, std::shared_ptr<StoreAPI> store,
continue;
}
/* If any step has an unsupported system type, then fail the
build. */
bool allSupported = true;
for (auto & r : newRunnable) {
bool supported = false;
{
auto machines_(machines.lock()); // FIXME: use shared_mutex
for (auto & m : *machines_)
if (m->supportsStep(r)) { supported = true; break; }
}
if (!supported) { allSupported = false; break; }
}
if (!allSupported) {
printMsg(lvlError, format("aborting unsupported build %1%") % build->id);
pqxx::work txn(conn);
txn.parameterized
("update Builds set finished = 1, busy = 0, buildStatus = $2, startTime = $3, stopTime = $3, errorMsg = $4 where id = $1")
(build->id)
((int) bsAborted)
(time(0))
("unsupported system type").exec();
txn.commit();
continue;
}
/* Note: if we exit this scope prior to this, the build and
all newly created steps are destroyed. */
@ -763,8 +796,7 @@ MachineReservation::ptr State::findMachine(Step::ptr step)
auto machines_(machines.lock());
for (auto & machine : *machines_) {
if (!has(machine->systemTypes, step->drv.platform)) continue;
// FIXME: check features
if (!machine->supportsStep(step)) continue;
{
auto currentJobs_(machine->currentJobs.lock());
if (*currentJobs_ >= machine->maxJobs) continue;