max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 22:16:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ssh-ng: Don't set CPU affinity on the remote

Browse source 
Fixes #3138.
This commit is contained in:
Eelco Dolstra 2019-10-11 18:48:59 +02:00
parent 7d8c99eb43
commit 906d56a96b
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

2
src/libstore/remote-store.cc
View file

@ -151,7 +151,7 @@ void RemoteStore::initConnection(Connection & conn)
conn.to << PROTOCOL_VERSION; conn.to << PROTOCOL_VERSION;
if (GET_PROTOCOL_MINOR(conn.daemonVersion) >= 14) { if (GET_PROTOCOL_MINOR(conn.daemonVersion) >= 14) {
int cpu = settings.lockCPU ? lockToCurrentCPU() : -1; int cpu = sameMachine() && settings.lockCPU ? lockToCurrentCPU() : -1;
if (cpu != -1) if (cpu != -1)
conn.to << 1 << cpu; conn.to << 1 << cpu;
else else

5
src/libstore/remote-store.hh
View file

@ -29,6 +29,8 @@ public:
const Setting<unsigned int> maxConnectionAge{(Store*) this, std::numeric_limits<unsigned int>::max(), const Setting<unsigned int> maxConnectionAge{(Store*) this, std::numeric_limits<unsigned int>::max(),
"max-connection-age", "number of seconds to reuse a connection"}; "max-connection-age", "number of seconds to reuse a connection"};
virtual bool sameMachine() = 0;
RemoteStore(const Params & params); RemoteStore(const Params & params);
/* Implementations of abstract store API methods. */ /* Implementations of abstract store API methods. */
@ -146,6 +148,9 @@ public:
std::string getUri() override; std::string getUri() override;
bool sameMachine()
{ return true; }
private: private:
ref<RemoteStore::Connection> openConnection() override; ref<RemoteStore::Connection> openConnection() override;

3
src/libstore/ssh-store.cc
View file

@ -35,6 +35,9 @@ public:
return uriScheme + host; return uriScheme + host;
} }
bool sameMachine()
{ return false; }
void narFromPath(const Path & path, Sink & sink) override; void narFromPath(const Path & path, Sink & sink) override;
ref<FSAccessor> getFSAccessor() override; ref<FSAccessor> getFSAccessor() override;