From 7f6837a0f6e7702a9e8c6da622873b955aa414cd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 May 2017 14:36:59 +0200 Subject: [PATCH] Replace $NIX_REMOTE_SYSTEMS with an option "builder-files" Also, to unify with hydra-queue-runner, allow it to be a list of files. --- src/libstore/globals.cc | 4 ++++ src/libstore/globals.hh | 4 ++++ src/libstore/machines.cc | 36 +++++++++++++++++++++++------------- src/libstore/machines.hh | 4 +++- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 953bf6aaa..4bdbde989 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -43,6 +43,10 @@ Settings::Settings() lockCPU = getEnv("NIX_AFFINITY_HACK", "1") == "1"; caFile = getEnv("NIX_SSL_CERT_FILE", getEnv("SSL_CERT_FILE", "/etc/ssl/certs/ca-certificates.crt")); + /* Backwards compatibility. */ + auto s = getEnv("NIX_REMOTE_SYSTEMS"); + if (s != "") builderFiles = tokenizeString(s, ":"); + #if __linux__ sandboxPaths = tokenizeString("/bin/sh=" BASH_PATH); #endif diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index d7a0b86a0..ac6f6a2cf 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -133,6 +133,10 @@ public: Setting builders{this, "", "builders", "A semicolon-separated list of build machines, in the format of nix.machines."}; + Setting builderFiles{this, + {nixConfDir + "/machines"}, "builder-files", + "A list of files specifying build machines."}; + Setting reservedSize{this, 8 * 1024 * 1024, "gc-reserved-space", "Amount of reserved disk space for the garbage collector."}; diff --git a/src/libstore/machines.cc b/src/libstore/machines.cc index 479ed1432..c1d904753 100644 --- a/src/libstore/machines.cc +++ b/src/libstore/machines.cc @@ -12,7 +12,8 @@ Machine::Machine(decltype(storeUri) storeUri, decltype(maxJobs) maxJobs, decltype(speedFactor) speedFactor, decltype(supportedFeatures) supportedFeatures, - decltype(mandatoryFeatures) mandatoryFeatures) : + decltype(mandatoryFeatures) mandatoryFeatures, + decltype(sshPublicHostKey) sshPublicHostKey) : storeUri( // Backwards compatibility: if the URI is a hostname, // prepend ssh://. @@ -24,7 +25,8 @@ Machine::Machine(decltype(storeUri) storeUri, maxJobs(maxJobs), speedFactor(std::max(1U, speedFactor)), supportedFeatures(supportedFeatures), - mandatoryFeatures(mandatoryFeatures) + mandatoryFeatures(mandatoryFeatures), + sshPublicHostKey(sshPublicHostKey) {} bool Machine::allSupported(const std::set & features) const { @@ -52,13 +54,19 @@ void parseMachines(const std::string & s, Machines & machines) auto sz = tokens.size(); if (sz < 1) throw FormatError("bad machine specification ā€˜%sā€™", line); + + auto isSet = [&](int n) { + return tokens.size() > n && tokens[n] != "" && tokens[n] != "-"; + }; + machines.emplace_back(tokens[0], - sz >= 2 ? tokenizeString>(tokens[1], ",") : std::vector{settings.thisSystem}, - sz >= 3 ? tokens[2] : "", - sz >= 4 ? std::stoull(tokens[3]) : 1LL, - sz >= 5 ? std::stoull(tokens[4]) : 1LL, - sz >= 6 ? tokenizeString>(tokens[5], ",") : std::set{}, - sz >= 7 ? tokenizeString>(tokens[6], ",") : std::set{}); + isSet(1) ? tokenizeString>(tokens[1], ",") : std::vector{settings.thisSystem}, + isSet(2) ? tokens[2] : "", + isSet(3) ? std::stoull(tokens[3]) : 1LL, + isSet(4) ? std::stoull(tokens[4]) : 1LL, + isSet(5) ? tokenizeString>(tokens[5], ",") : std::set{}, + isSet(6) ? tokenizeString>(tokens[6], ",") : std::set{}, + isSet(7) ? tokens[7] : ""); } } @@ -66,11 +74,13 @@ Machines getMachines() { Machines machines; - try { - parseMachines(readFile(getEnv("NIX_REMOTE_SYSTEMS", settings.nixConfDir + "/machines")), machines); - } catch (const SysError & e) { - if (e.errNo != ENOENT) - throw; + for (auto & file : settings.builderFiles.get()) { + try { + parseMachines(readFile(file), machines); + } catch (const SysError & e) { + if (e.errNo != ENOENT) + throw; + } } parseMachines(settings.builders, machines); diff --git a/src/libstore/machines.hh b/src/libstore/machines.hh index e04557428..de92eb924 100644 --- a/src/libstore/machines.hh +++ b/src/libstore/machines.hh @@ -13,6 +13,7 @@ struct Machine { const unsigned int speedFactor; const std::set supportedFeatures; const std::set mandatoryFeatures; + const std::string sshPublicHostKey; bool enabled = true; bool allSupported(const std::set & features) const; @@ -25,7 +26,8 @@ struct Machine { decltype(maxJobs) maxJobs, decltype(speedFactor) speedFactor, decltype(supportedFeatures) supportedFeatures, - decltype(mandatoryFeatures) mandatoryFeatures); + decltype(mandatoryFeatures) mandatoryFeatures, + decltype(sshPublicHostKey) sshPublicHostKey); }; typedef std::vector Machines;