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

Finish copyClosure

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-09 16:03:41 +02:00
parent c93aa92563
commit 7dd1f0097e
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/hydra-queue-runner/build-remote.cc
View file

@ -62,8 +62,6 @@ static void copyClosureTo(std::shared_ptr<StoreAPI> store,
for (auto & path : paths) for (auto & path : paths)
computeFSClosure(*store, path, closure); computeFSClosure(*store, path, closure);
Paths sorted = topoSortPaths(*store, closure);
/* Send the "query valid paths" command with the "lock" option /* Send the "query valid paths" command with the "lock" option
enabled. This prevents a race where the remote host enabled. This prevents a race where the remote host
garbage-collect paths that are already there. Optionally, ask garbage-collect paths that are already there. Optionally, ask
@ -71,21 +69,29 @@ static void copyClosureTo(std::shared_ptr<StoreAPI> store,
writeInt(cmdQueryValidPaths, to); writeInt(cmdQueryValidPaths, to);
writeInt(1, to); // == lock paths writeInt(1, to); // == lock paths
writeInt(useSubstitutes, to); writeInt(useSubstitutes, to);
writeStrings(sorted, to); writeStrings(closure, to);
to.flush(); to.flush();
/* Get back the set of paths that are already valid on the remote /* Get back the set of paths that are already valid on the remote
host. */ host. */
auto present = readStorePaths<PathSet>(from); auto present = readStorePaths<PathSet>(from);
PathSet missing; if (present.size() == closure.size()) return;
std::set_difference(closure.begin(), closure.end(), present.begin(), present.end(),
std::inserter(missing, missing.end())); Paths sorted = topoSortPaths(*store, closure);
Paths missing;
for (auto i = sorted.rbegin(); i != sorted.rend(); ++i)
if (present.find(*i) == present.end()) missing.push_back(*i);
printMsg(lvlError, format("sending %1% missing paths") % missing.size()); printMsg(lvlError, format("sending %1% missing paths") % missing.size());
if (missing.empty()) return;
throw Error("NOT IMPL 1"); writeInt(cmdImportPaths, to);
exportPaths(*store, missing, false, to);
to.flush();
if (readInt(from) != 1)
throw Error("remote machine failed to import closure");
} }