Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c67476fb7ad3
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0ccf36be3591
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Apr 19, 2018

  1. ssh-ng: Don't forward options to the daemon. 

    This can be iterated on and currently leaves out settings we know we
want to forward, but it fixes #1713 and fixes #1935 and isn't
fundamentally broken like the status quo. Future changes are suggested
in a comment.

(cherry picked from commit 088ef81)
    @shlevy
    shlevy committed Apr 19, 2018
    Copy the full SHA
    0ccf36b View commit details
Showing with 12 additions and 1 deletion.
  1. +2 −1 src/libstore/remote-store.hh
  2. +10 −0 src/libstore/ssh-store.cc
3 changes: 2 additions & 1 deletion src/libstore/remote-store.hh
View file
Original file line number Diff line number Diff line change
@@ -122,11 +122,12 @@ protected:

ref<Pool<Connection>> connections;

virtual void setOptions(Connection & conn);

private:

std::atomic_bool failed{false};

void setOptions(Connection & conn);
};

class UDSRemoteStore : public LocalFSStore, public RemoteStore
10 changes: 10 additions & 0 deletions src/libstore/ssh-store.cc
View file
Original file line number Diff line number Diff line change
@@ -51,6 +51,16 @@ class SSHStore : public RemoteStore
std::string host;

SSHMaster master;

void setOptions(RemoteStore::Connection & conn) override
{
/* TODO Add a way to explicitly ask for some options to be
forwarded. One option: A way to query the daemon for its
settings, and then a series of params to SSHStore like
forward-cores or forward-overridden-cores that only
override the requested settings.
*/
};
};