ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

ssh: Support using the experimental nix copy command to copy

Browse source 
The new SSH store protocol (ssh-ng://) provides better performance.
This is now enabled for flake deployments.
This commit is contained in:
Zhaofeng Li 2022-09-18 17:27:46 -06:00
parent 695ec0c36f
commit 3e8ec98a26
2 changed files with 78 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/nix/hive/mod.rs
View file

@ -205,6 +205,11 @@ impl Hive {
if let Some(ssh_config) = &ssh_config {
host.set_ssh_config(ssh_config.clone());
}
if self.is_flake() {
host.set_use_nix3_copy(true);
}
host.upcast()
});
let ssh_host = host.is_some();

96
src/nix/host/ssh.rs
View file

@ -32,6 +32,9 @@ pub struct Ssh {
/// Command to elevate privileges with.
privilege_escalation_command: Vec<String>,
/// Whether to use the experimental `nix copy` command.
use_nix3_copy: bool,
job: Option<JobHandle>,
}
@ -187,6 +190,7 @@ impl Ssh {
port: None,
ssh_config: None,
privilege_escalation_command: Vec::new(),
use_nix3_copy: false,
job: None,
}
}
@ -203,6 +207,10 @@ impl Ssh {
self.privilege_escalation_command = command;
}
pub fn set_use_nix3_copy(&mut self, enable: bool) {
self.use_nix3_copy = enable;
}
pub fn upcast(self) -> Box<dyn Host> {
Box::new(self)
}
@ -252,31 +260,73 @@ impl Ssh {
let ssh_options = self.ssh_options();
let ssh_options_str = ssh_options.join(" ");
let mut command = Command::new("nix-copy-closure");
match direction {
CopyDirection::ToRemote => {
command.arg("--to");
}
CopyDirection::FromRemote => {
command.arg("--from");
}
}
let mut command = if self.use_nix3_copy {
// experimental `nix copy` command with ssh-ng://
let mut command = Command::new("nix");
// FIXME: Host-agnostic abstraction
if options.include_outputs {
command.arg("--include-outputs");
}
if options.use_substitutes {
command.arg("--use-substitutes");
}
if options.gzip {
command.arg("--gzip");
}
command.args(&[
"--extra-experimental-features",
"nix-command",
"copy",
"--no-check-sigs",
]);
command
.arg(&self.ssh_target())
.arg(path.as_path())
.env("NIX_SSHOPTS", ssh_options_str);
if options.use_substitutes {
command.arg("--substitute-on-destination");
}
if path.ends_with(".drv") {
command.arg("--derivation");
}
match direction {
CopyDirection::ToRemote => {
command.arg("--to");
}
CopyDirection::FromRemote => {
command.arg("--from");
}
}
let mut store_uri = format!("ssh-ng://{}", self.ssh_target());
if options.gzip {
store_uri += "?compress=true";
}
command.arg(store_uri);
command.arg(path.as_path());
command
} else {
// nix-copy-closure (ssh://)
let mut command = Command::new("nix-copy-closure");
match direction {
CopyDirection::ToRemote => {
command.arg("--to");
}
CopyDirection::FromRemote => {
command.arg("--from");
}
}
// FIXME: Host-agnostic abstraction
if options.include_outputs {
command.arg("--include-outputs");
}
if options.use_substitutes {
command.arg("--use-substitutes");
}
if options.gzip {
command.arg("--gzip");
}
command.arg(&self.ssh_target()).arg(path.as_path());
command
};
command.env("NIX_SSHOPTS", ssh_options_str);
command
}