nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

offload: Allow one transfer in each direction simultaneously. 

* guix/scripts/offload.scm (transfer-and-offload): Use 'upload' lock
  instead of 'bandwidth' around 'send-files' calls, and 'download' lock
  around 'retrieve-files' call.
This commit is contained in:
Ludovic Courtès 2014-03-26 15:03:14 +01:00
parent 3dfd8af534
commit 236e66481d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/scripts/offload.scm
View File

@ -324,10 +324,10 @@ there, and write the build log to LOG-PORT. Return the exit status."
"Offload DRV to MACHINE. Prior to the actual offloading, transfer all of "Offload DRV to MACHINE. Prior to the actual offloading, transfer all of
INPUTS to MACHINE; if building DRV succeeds, retrieve all of OUTPUTS from INPUTS to MACHINE; if building DRV succeeds, retrieve all of OUTPUTS from
MACHINE." MACHINE."
;; Acquire MACHINE's exclusive lock to serialize file transfers ;; Acquire MACHINE's upload or download lock to serialize file transfers in
;; to/from MACHINE in the presence of several 'offload' hook ;; a given direction to/from MACHINE in the presence of several 'offload'
;; instance. ;; hook instance.
(when (with-machine-lock machine 'bandwidth (when (with-machine-lock machine 'upload
(send-files (cons (derivation-file-name drv) inputs) (send-files (cons (derivation-file-name drv) inputs)
machine)) machine))
(let ((status (offload drv machine (let ((status (offload drv machine
@ -337,7 +337,7 @@ MACHINE."
(if (zero? status) (if (zero? status)
(begin (begin
;; Likewise (see above.) ;; Likewise (see above.)
(with-machine-lock machine 'bandwidth (with-machine-lock machine 'download
(retrieve-files outputs machine)) (retrieve-files outputs machine))
(format (current-error-port) (format (current-error-port)
"done with offloaded '~a'~%" "done with offloaded '~a'~%"