Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2026-11-02 08:34:44 +00:00
Code Issues Projects Releases Wiki Activity

support for job and node tags

Browse Source
This commit is contained in:
Oliver Giles
2015-09-24 22:02:11 +02:00
parent 79c3ee5fcb
commit 0df97e95fd
6 changed files with 72 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/laminar.cpp
View File

@@ -310,6 +310,17 @@ bool Laminar::loadConfiguration() {
Node node;
node.name = it.path().filename().string();
node.numExecutors = conf.get<int>("EXECUTORS", 6);
std::string tags = conf.get<std::string>("TAGS");
if(!tags.empty()) {
std::istringstream iss(tags);
std::set<std::string> tagList;
std::copy(std::istream_iterator<std::string>(iss),
std::istream_iterator<std::string>(),
std::inserter(tagList, tagList.begin()));
node.tags = tagList;
}
nm.emplace(node.name, std::move(node));
}
}
@@ -324,6 +335,32 @@ bool Laminar::loadConfiguration() {
nodes = nm;
fs::path jobsDir = fs::path(homeDir)/"cfg"/"jobs";
if(fs::is_directory(jobsDir)) {
fs::directory_iterator dit(jobsDir);
for(fs::directory_entry& it : dit) {
if(!fs::is_directory(it.status()))
continue;
fs::directory_entry config(it.path()/"config");
if(!fs::is_regular_file(config.status()))
continue;
StringMap conf = parseConfFile(config.path().string().c_str());
std::string tags = conf.get<std::string>("TAGS");
if(!tags.empty()) {
std::istringstream iss(tags);
std::set<std::string> tagList;
std::copy(std::istream_iterator<std::string>(iss),
std::istream_iterator<std::string>(),
std::inserter(tagList, tagList.begin()));
jobTags[it.path().filename().string()] = tagList;
}
}
}
return true;
}
@@ -425,6 +462,29 @@ void Laminar::reapAdvance() {
assignNewJobs();
}
bool Laminar::nodeCanQueue(const Node& node, const Run& run) const {
// if a node is too busy, it can't take the job
if(node.busyExecutors >= node.numExecutors)
return false;
auto it = jobTags.find(run.name);
// if both nodes have no tags, it's OK
if(it == jobTags.end() && node.tags.size() == 0)
return true;
// but if just one of them does, don't allow the build
if(it == jobTags.end() || node.tags.size() == 0)
return false;
// in other cases, allow the build if they have a tag in common
for(const std::string& tag : it->second) {
if(node.tags.find(tag) != node.tags.end())
return true;
}
return false;
}
void Laminar::assignNewJobs() {
auto it = queuedJobs.begin();
while(it != queuedJobs.end()) {
@@ -432,7 +492,7 @@ void Laminar::assignNewJobs() {
for(auto& sn : nodes) {
Node& node = sn.second;
std::shared_ptr<Run> run = *it;
if(node.queue(*run)) {
if(nodeCanQueue(node, *run)) {
node.busyExecutors++;
run->node = &node;
run->startedAt = time(0);