mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build-remote: Don't use a SSH master

Browse source 
This is unnecessary because we make only one connection.
This commit is contained in:
Eelco Dolstra 2017-03-03 19:23:20 +01:00
parent d140c75530
commit d3eb1cf3bb
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/build-remote/build-remote.cc
View file

@ -233,7 +233,9 @@ int main (int argc, char * * argv)
lock = -1; lock = -1;
try { try {
sshStore = openStore("ssh://" + bestMachine->hostName + "?ssh-key=" + bestMachine->sshKey); sshStore = openStore("ssh://" + bestMachine->hostName,
{ {"ssh-key", bestMachine->sshKey },
{"max-connections", "1" } });
hostName = bestMachine->hostName; hostName = bestMachine->hostName;
} catch (std::exception & e) { } catch (std::exception & e) {
printError("unable to open SSH connection to ‘%s’: %s; trying other available machines...", printError("unable to open SSH connection to ‘%s’: %s; trying other available machines...",

4
src/libstore/store-api.cc
View file

@ -708,7 +708,11 @@ ref<Store> openStore(const std::string & uri_)
} }
uri = uri_.substr(0, q); uri = uri_.substr(0, q);
} }
return openStore(uri, params);
}
ref<Store> openStore(const std::string & uri, const Store::Params & params)
{
for (auto fun : *RegisterStoreImplementation::implementations) { for (auto fun : *RegisterStoreImplementation::implementations) {
auto store = fun(uri, params); auto store = fun(uri, params);
if (store) return ref<Store>(store); if (store) return ref<Store>(store);

2
src/libstore/store-api.hh
View file

@ -642,6 +642,8 @@ void removeTempRoots();
set to true *unless* you're going to collect garbage. */ set to true *unless* you're going to collect garbage. */
ref<Store> openStore(const std::string & uri = getEnv("NIX_REMOTE")); ref<Store> openStore(const std::string & uri = getEnv("NIX_REMOTE"));
ref<Store> openStore(const std::string & uri, const Store::Params & params);
void copyPaths(ref<Store> from, ref<Store> to, const Paths & storePaths, bool substitute = false); void copyPaths(ref<Store> from, ref<Store> to, const Paths & storePaths, bool substitute = false);