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

Keep track of the number of build steps that are being built

Browse Source 
(As opposed to being in the closure copying stage.)
This commit is contained in:
Eelco Dolstra
2015-06-22 11:23:00 +02:00
parent fed71d3fe9
commit 44a2b74f5a
4 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/hydra-queue-runner/hydra-queue-runner.cc
View File

@ -19,6 +19,7 @@
#include "build-remote.hh"
#include "sync.hh"
#include "pool.hh"
#include "counter.hh"
#include "store-api.hh"
#include "derivations.hh"
@ -43,16 +44,6 @@ bool has(const C & c, const V & v)
}
typedef std::atomic<unsigned int> counter;
struct MaintainCount
{
counter & c;
MaintainCount(counter & c) : c(c) { c++; }
~MaintainCount() { c--; }
};
typedef enum {
bsSuccess = 0,
bsFailed = 1,
@ -252,6 +243,7 @@ private:
counter nrBuildsDone{0};
counter nrStepsDone{0};
counter nrActiveSteps{0};
counter nrStepsBuilding{0};
counter nrRetries{0};
counter maxNrRetries{0};
counter nrQueueWakeups{0};
@ -1094,7 +1086,7 @@ bool State::doBuildStep(std::shared_ptr<StoreAPI> store, Step::ptr step,
try {
/* FIXME: referring builds may have conflicting timeouts. */
buildRemote(store, machine->sshName, machine->sshKey, step->drvPath, step->drv,
logDir, build->maxSilentTime, build->buildTimeout, result);
logDir, build->maxSilentTime, build->buildTimeout, result, nrStepsBuilding);
} catch (Error & e) {
result.status = RemoteResult::rrMiscFailure;
result.errorMsg = e.msg();
@ -1432,6 +1424,7 @@ void State::dumpStatus()
printMsg(lvlError, format("%1% runnable build steps") % runnable_->size());
}
printMsg(lvlError, format("%1% active build steps") % nrActiveSteps);
printMsg(lvlError, format("%1% build steps currently building") % nrStepsBuilding);
printMsg(lvlError, format("%1% builds read from queue") % nrBuildsRead);
printMsg(lvlError, format("%1% builds done") % nrBuildsDone);
printMsg(lvlError, format("%1% build steps done") % nrStepsDone);