Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

increment busyExecutors only when queueing cannot fail

Browse Source
This commit is contained in:
Oliver Giles 2015-11-01 11:35:46 +01:00
parent 695b52c101
commit 56a8301e85
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/laminar.cpp
View File

@ -528,27 +528,17 @@ void Laminar::assignNewJobs() {
Node& node = sn.second; Node& node = sn.second;
std::shared_ptr<Run> run = *it; std::shared_ptr<Run> run = *it;
if(nodeCanQueue(node, *run)) { if(nodeCanQueue(node, *run)) {
node.busyExecutors++;
run->node = &node;
run->startedAt = time(0);
run->build = ++buildNums[run->name];
run->laminarHome = homeDir;
// set the last known result if exists
db->stmt("SELECT result FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1")
.bind(run->name)
.fetch<int>([=](int result){
run->lastResult = RunState(result);
});
int buildNum = buildNums[run->name] + 1;
// create a working directory (different to a workspace!) // create a working directory (different to a workspace!)
fs::path wd = fs::path(homeDir)/"run"/run->name/std::to_string(run->build); fs::path wd = fs::path(homeDir)/"run"/run->name/std::to_string(buildNum);
if(!fs::create_directory(wd)) { if(!fs::create_directory(wd)) {
KJ_LOG(ERROR, "Could not create working directory", wd.string()); KJ_LOG(ERROR, "Could not create working directory", wd.string());
break; break;
} }
run->wd = wd.string(); run->wd = wd.string();
// create an archive directory // create an archive directory
fs::path archive = fs::path(homeDir)/"archive"/run->name/std::to_string(run->build); fs::path archive = fs::path(homeDir)/"archive"/run->name/std::to_string(buildNum);
if(!fs::create_directories(archive)) { if(!fs::create_directories(archive)) {
KJ_LOG(ERROR, "Could not create archive directory", archive.string()); KJ_LOG(ERROR, "Could not create archive directory", archive.string());
break; break;
@ -585,6 +575,21 @@ void Laminar::assignNewJobs() {
if(fs::exists(cfgDir/"jobs"/run->name/"env")) if(fs::exists(cfgDir/"jobs"/run->name/"env"))
run->addEnv((cfgDir/"jobs"/run->name/"env").string()); run->addEnv((cfgDir/"jobs"/run->name/"env").string());
// start the job
node.busyExecutors++;
run->node = &node;
run->startedAt = time(0);
run->laminarHome = homeDir;
run->build = buildNum;
// set the last known result if exists
db->stmt("SELECT result FROM builds WHERE name = ? ORDER BY completedAt DESC LIMIT 1")
.bind(run->name)
.fetch<int>([=](int result){
run->lastResult = RunState(result);
});
// update next build number
buildNums[run->name] = buildNum;
KJ_LOG(INFO, "Queued job to node", run->name, run->build, node.name); KJ_LOG(INFO, "Queued job to node", run->name, run->build, node.name);
// notify clients // notify clients