ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Update to reflect BinaryCacheStore changes

Browse Source 
BinaryCacheStore no longer implements buildPaths() and ensurePath(),
so we need to use copyPath() / copyClosure().
This commit is contained in:
Eelco Dolstra
2016-10-07 20:23:05 +02:00
parent fb0d2d2dda
commit ee2e9f5335
5 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/hydra-queue-runner/state.hh
View File

@ -257,6 +257,8 @@ private:
std::map<std::string, std::string> hydraConfig;
bool useSubstitutes = false;
/* The queued builds. */
typedef std::map<BuildID, Build::ptr> Builds;
nix::Sync<Builds> builds;
@ -374,7 +376,7 @@ private:
std::atomic<time_t> lastDispatcherCheck{0};
std::shared_ptr<nix::Store> _localStore;
std::shared_ptr<nix::Store> localStore;
std::shared_ptr<nix::Store> _destStore;
/* Token server to prevent threads from allocating too many big
@ -401,10 +403,6 @@ private:
MaintainCount startDbUpdate();
/* Return a store object that can access derivations produced by
hydra-evaluator. */
nix::ref<nix::Store> getLocalStore();
/* Return a store object to store build results. */
nix::ref<nix::Store> getDestStore();
@ -436,7 +434,7 @@ private:
void queueMonitorLoop();
/* Check the queue for new builds. */
bool getQueuedBuilds(Connection & conn, nix::ref<nix::Store> localStore,
bool getQueuedBuilds(Connection & conn,
nix::ref<nix::Store> destStore, unsigned int & lastBuildId);
/* Handle cancellation, deletion and priority bumps. */