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

hydra-queue-runner: Maintain count of active build steps

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-18 00:24:56 +02:00
parent 59dae60558
commit f57d0b0c54
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,8 @@ static void openConnection(const string & sshName, const string & sshKey,
if (dup2(stderrFD, STDERR_FILENO) == -1) if (dup2(stderrFD, STDERR_FILENO) == -1)
throw SysError("cannot dup stderr"); throw SysError("cannot dup stderr");
// FIXME: ensure no password prompt.
// FIXME: connection timeouts
Strings argv({"ssh", sshName, "-i", sshKey, "-x", "-a", "--", "nix-store", "--serve", "--write"}); Strings argv({"ssh", sshName, "-i", sshKey, "-x", "-a", "--", "nix-store", "--serve", "--write"});
execvp("ssh", (char * *) stringsToCharPtrs(argv).data()); // FIXME: remove cast execvp("ssh", (char * *) stringsToCharPtrs(argv).data()); // FIXME: remove cast

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

@ -39,6 +39,13 @@ bool has(const C & c, const V & v)
typedef std::atomic<unsigned int> counter; typedef std::atomic<unsigned int> counter;
struct MaintainCount
{
counter & c;
MaintainCount(counter & c) : c(c) { c++; }
~MaintainCount() { c--; }
};
typedef enum { typedef enum {
bsSuccess = 0, bsSuccess = 0,
@ -229,6 +236,7 @@ private:
counter nrBuildsRead{0}; counter nrBuildsRead{0};
counter nrBuildsDone{0}; counter nrBuildsDone{0};
counter nrStepsDone{0}; counter nrStepsDone{0};
counter nrActiveSteps{0};
counter nrRetries{0}; counter nrRetries{0};
counter maxNrRetries{0}; counter maxNrRetries{0};
counter nrQueueWakeups{0}; counter nrQueueWakeups{0};
@ -957,6 +965,8 @@ void State::builder(Step::ptr step, MachineReservation::ptr reservation)
{ {
bool retry = true; bool retry = true;
MaintainCount mc(nrActiveSteps);
try { try {
auto store = openStore(); // FIXME: pool auto store = openStore(); // FIXME: pool
retry = doBuildStep(store, step, reservation->machine); retry = doBuildStep(store, step, reservation->machine);
@ -1252,6 +1262,7 @@ void State::dumpStatus()
if (i->lock()) ++i; else i = runnable_->erase(i); if (i->lock()) ++i; else i = runnable_->erase(i);
printMsg(lvlError, format("%1% runnable build steps") % runnable_->size()); printMsg(lvlError, format("%1% runnable build steps") % runnable_->size());
} }
printMsg(lvlError, format("%1% active build steps") % nrActiveSteps);
printMsg(lvlError, format("%1% builds read from queue") % nrBuildsRead); printMsg(lvlError, format("%1% builds read from queue") % nrBuildsRead);
printMsg(lvlError, format("%1% builds done") % nrBuildsDone); printMsg(lvlError, format("%1% builds done") % nrBuildsDone);
printMsg(lvlError, format("%1% build steps done") % nrStepsDone); printMsg(lvlError, format("%1% build steps done") % nrStepsDone);