From 7bb632b02464febd8806ef4bd3fa0ac107f52650 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 10 Jul 2014 20:43:04 +0200 Subject: [PATCH] =?UTF-8?q?nix-copy-closure=20-s:=20Do=20substitutions=20v?= =?UTF-8?q?ia=20=E2=80=98nix-store=20--serve=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This means we no longer need an SSH master connection, since we only execute a single command on the remote host. --- perl/lib/Nix/CopyClosure.pm | 19 +++++++++------- scripts/nix-copy-closure.in | 5 ++-- src/download-via-ssh/download-via-ssh.cc | 1 + src/nix-store/nix-store.cc | 29 ++++++++++++++++++++++++ 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/perl/lib/Nix/CopyClosure.pm b/perl/lib/Nix/CopyClosure.pm index 53da72038..779d7439f 100644 --- a/perl/lib/Nix/CopyClosure.pm +++ b/perl/lib/Nix/CopyClosure.pm @@ -29,16 +29,12 @@ sub copyTo { my ($sshHost, $sshOpts, $storePaths, $compressor, $decompressor, $includeOutputs, $dryRun, $sign, $progressViewer, $useSubstitutes) = @_; + $useSubstitutes = 0 if $dryRun; + # Get the closure of this path. my @closure = reverse(topoSortPaths(computeFSClosure(0, $includeOutputs, map { followLinksToStorePath $_ } @{$storePaths}))); - # Optionally use substitutes on the remote host. - if (!$dryRun && $useSubstitutes) { - system "ssh $sshHost @{$sshOpts} nix-store -r --ignore-unknown @closure"; - # Ignore exit status because this is just an optimisation. - } - # Start ‘nix-store --serve’ on the remote host. my ($from, $to); my $pid = open2($from, $to, "ssh $sshHost @{$sshOpts} nix-store --serve --write"); @@ -60,8 +56,9 @@ sub copyTo { # Send the "query valid paths" command with the "lock" option # enabled. This prevents a race where the remote host - # garbage-collect paths that are already there. - syswrite($to, pack("L & pipes) if (cmd == "have") { writeInt(cmdQueryValidPaths, pipes.first); writeInt(0, pipes.first); // don't lock + writeInt(0, pipes.first); // don't substitute writeStrings(tokenized, pipes.first); pipes.first.flush(); PathSet paths = readStrings(pipes.second); diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index 28b205b1f..f31eb0e29 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -896,16 +896,42 @@ static void opServe(Strings opFlags, Strings opArgs) } switch (cmd) { + case cmdQueryValidPaths: { bool lock = readInt(in); + bool substitute = readInt(in); PathSet paths = readStorePaths(in); if (lock && writeAllowed) for (auto & path : paths) store->addTempRoot(path); + + /* If requested, substitute missing paths. This + implements nix-copy-closure's --use-substitutes + flag. */ + if (substitute && writeAllowed) { + /* Filter out .drv files (we don't want to build anything). */ + PathSet paths2; + for (auto & path : paths) + if (!isDerivation(path)) paths2.insert(path); + unsigned long long downloadSize, narSize; + PathSet willBuild, willSubstitute, unknown; + queryMissing(*store, PathSet(paths2.begin(), paths2.end()), + willBuild, willSubstitute, unknown, downloadSize, narSize); + /* FIXME: should use ensurePath(), but it only + does one path at a time. */ + if (!willSubstitute.empty()) + try { + store->buildPaths(willSubstitute); + } catch (Error & e) { + printMsg(lvlError, format("warning: %1%") % e.msg()); + } + } + writeStrings(store->queryValidPaths(paths), out); out.flush(); break; } + case cmdQueryPathInfos: { PathSet paths = readStorePaths(in); // !!! Maybe we want a queryPathInfos? @@ -924,10 +950,12 @@ static void opServe(Strings opFlags, Strings opArgs) out.flush(); break; } + case cmdDumpStorePath: dumpPath(readStorePath(in), out); out.flush(); break; + case cmdImportPaths: { if (!writeAllowed) throw Error("importing paths not allowed"); string compression = readString(in); @@ -966,6 +994,7 @@ static void opServe(Strings opFlags, Strings opArgs) break; } + default: throw Error(format("unknown serve command %1%") % cmd); }