lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* `nix-copy-closure --from': copy from a remote machine instead of to

Browse source 
a remote machine.
This commit is contained in:
Eelco Dolstra 2007-03-26 21:05:17 +00:00
parent 7edd2e2cd2
commit d303b389a9
2 changed files with 67 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/manual/release-notes.xml
View file

@ -15,6 +15,11 @@
<listitem><para>TODO: multi-user support.</para></listitem> <listitem><para>TODO: multi-user support.</para></listitem>
<listitem><para><command>nix-copy-closure</command> copies the
missing parts of a closure to or from a remote
machine.</para></listitem>
<listitem><para><command>nix-prefetch-url</command> now by default <listitem><para><command>nix-prefetch-url</command> now by default
computes the SHA-256 hash of the file instead of the MD5 hash. In computes the SHA-256 hash of the file instead of the MD5 hash. In
calls to <function>fetchurl</function> you should pass an calls to <function>fetchurl</function> you should pass an

72
scripts/nix-copy-closure.in
View file

@ -6,7 +6,7 @@ $binDir = "@bindir@" unless defined $binDir;
if (scalar @ARGV < 1) { if (scalar @ARGV < 1) {
print STDERR <<EOF print STDERR <<EOF
Usage: nix-copy-closure HOSTNAME [--sign] PATHS... Usage: nix-copy-closure [--from | --to] HOSTNAME [--sign] PATHS...
EOF EOF
; ;
exit 1; exit 1;
@ -30,23 +30,27 @@ my @storePaths = ();
while (@ARGV) { while (@ARGV) {
my $arg = shift @ARGV; my $arg = shift @ARGV;
if ($arg eq "--sign") { if ($arg eq "--sign") {
$sign = 1; $sign = 1;
next;
} }
if ($arg eq "--gzip") { elsif ($arg eq "--gzip") {
$compressor = "gzip"; $compressor = "gzip";
$decompressor = "gunzip"; $decompressor = "gunzip";
next;
} }
elsif ($arg eq "--from") {
if (!defined $sshHost) { $toMode = 0;
}
elsif ($arg eq "--to") {
$toMode = 1;
}
elsif (!defined $sshHost) {
$sshHost = $arg; $sshHost = $arg;
next;
} }
else {
push @storePaths, $arg; push @storePaths, $arg;
} }
}
if ($toMode) { # Copy TO the remote machine. if ($toMode) { # Copy TO the remote machine.
@ -69,7 +73,7 @@ if ($toMode) { # Copy TO the remote machine.
die "bad: $_" unless /^\//; die "bad: $_" unless /^\//;
if (!defined $storePathsSeen{$_}) { if (!defined $storePathsSeen{$_}) {
push @allStorePaths, $_; push @allStorePaths, $_;
$storePathsSeen{$_} = 1 $storePathsSeen{$_} = 1;
} }
} }
@ -82,7 +86,7 @@ if ($toMode) { # Copy TO the remote machine.
my @missing = (); my @missing = ();
while (<READ>) { while (<READ>) {
chomp; chomp;
print STDERR "target needs $_\n"; print STDERR "target machine needs $_\n";
push @missing, $_; push @missing, $_;
} }
close READ or die; close READ or die;
@ -93,7 +97,53 @@ if ($toMode) { # Copy TO the remote machine.
my $extraOpts = ""; my $extraOpts = "";
$extraOpts .= "--sign" if $sign == 1; $extraOpts .= "--sign" if $sign == 1;
system("nix-store --export $extraOpts @missing | $compressor | ssh @sshOpts $sshHost '$decompressor | nix-store --import'") == 0 system("nix-store --export $extraOpts @missing | $compressor | ssh @sshOpts $sshHost '$decompressor | nix-store --import'") == 0
or die "copying store paths to remote machine failed: $?"; or die "copying store paths to remote machine `$sshHost' failed: $?";
}
}
else { # Copy FROM the remote machine.
# Query the closure of the given store paths on the remote
# machine. Paths are assumed to be store paths; there is no
# resolution (following of symlinks).
my $pid = open(READ,
"ssh @sshOpts $sshHost nix-store --query --requisites @storePaths|") or die;
my @allStorePaths;
my %storePathsSeen;
while (<READ>) {
chomp;
die "bad: $_" unless /^\//;
if (!defined $storePathsSeen{$_}) {
push @allStorePaths, $_;
$storePathsSeen{$_} = 1;
print "GOT $_\n";
}
}
close READ or die "nix-store on remote machine `$sshHost' failed: $?";
# What paths are already valid locally?
open(READ, "@bindir@/nix-store --check-validity --print-invalid @allStorePaths|");
my @missing = ();
while (<READ>) {
chomp;
print STDERR "local machine needs $_\n";
push @missing, $_;
}
close READ or die;
# Export the store paths on the remote machine and import them on locally.
if (scalar @missing > 0) {
my $extraOpts = "";
$extraOpts .= "--sign" if $sign == 1;
system("ssh @sshOpts $sshHost 'nix-store --export $extraOpts @missing | $compressor' | $decompressor | nix-store --import") == 0
or die "copying store paths to remote machine `$sshHost' failed: $?";
} }
} }