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

hydra-queue-runner: --build-one: correctly handle a cached build

Browse Source 
Previously, the build ID would never flow through channels which
exited.

This patch tracks the buildOne state as part of State and exits avoids
waiting forever for new work.

The code around buildOnly is a bit rough, making this a bit weird to
implement but since it is only used for testing the value of improving
it on its own is a bit questionable.
This commit is contained in:
Graham Christensen
2021-03-16 16:09:36 -04:00
parent 930f05c38e
commit 87d46ad5d6
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/hydra-queue-runner/queue-monitor.cc
View File

@ -35,14 +35,17 @@ void State::queueMonitorLoop()
unsigned int lastBuildId = 0;
while (true) {
bool quit = false;
while (!quit) {
localStore->clearPathInfoCache();
bool done = getQueuedBuilds(*conn, destStore, lastBuildId);
if (buildOne && buildOneDone) quit = true;
/* Sleep until we get notification from the database about an
event. */
if (done) {
if (done && !quit) {
conn->await_notification();
nrQueueWakeups++;
} else
@ -65,6 +68,8 @@ void State::queueMonitorLoop()
processJobsetSharesChange(*conn);
}
}
exit(0);
}
@ -160,6 +165,7 @@ bool State::getQueuedBuilds(Connection & conn,
/* Some step previously failed, so mark the build as
failed right away. */
if (!buildOneDone && build->id == buildOne) buildOneDone = true;
printMsg(lvlError, "marking build %d as cached failure due to ‘%s’",
build->id, localStore->printStorePath(ex.step->drvPath));
if (!build->finishedInDB) {
@ -231,6 +237,7 @@ bool State::getQueuedBuilds(Connection & conn,
auto mc = startDbUpdate();
pqxx::work txn(conn);
time_t now = time(0);
if (!buildOneDone && build->id == buildOne) buildOneDone = true;
printMsg(lvlInfo, "marking build %1% as succeeded (cached)", build->id);
markSucceededBuild(txn, build, res, true, now, now);
notifyBuildFinished(txn, build->id, {});
@ -289,6 +296,8 @@ bool State::getQueuedBuilds(Connection & conn,
for (auto & r : newRunnable)
makeRunnable(r);
if (buildOne && newRunnable.size() == 0) buildOneDone = true;
nrBuildsRead += nrAdded;
/* Stop after a certain time to allow priority bumps to be