aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-10-29 00:28:03 +0100
committerLudovic Courtès <ludo@gnu.org>2014-10-29 00:31:23 +0100
commit940a8c57be7ecdd139ba450765f0cc26de5b8ec7 (patch)
tree4057204063525c8f001ef257568a8dfc680bcfc6
parentd2d0514b58bfddd061cd7f692bcc2075fdc33711 (diff)
downloadguix-940a8c57be7ecdd139ba450765f0cc26de5b8ec7.tar
guix-940a8c57be7ecdd139ba450765f0cc26de5b8ec7.tar.gz
offload: Remove mutual exclusion on transfers.
Suggested by Mark H. Weaver <mhw@netris.org> at <http://lists.gnu.org/archive/html/guix-devel/2014-10/msg00352.html>. * guix/scripts/offload.scm (transfer-and-offload): Remove uses of 'with-machine-lock'.
-rw-r--r--guix/scripts/offload.scm9
1 files changed, 2 insertions, 7 deletions
diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm
index 5d1c7c23cb..be233d96be 100644
--- a/guix/scripts/offload.scm
+++ b/guix/scripts/offload.scm
@@ -410,10 +410,7 @@ 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
INPUTS to MACHINE; if building DRV succeeds, retrieve all of OUTPUTS from
MACHINE."
- ;; Acquire MACHINE's upload or download lock to serialize file transfers in
- ;; a given direction to/from MACHINE in the presence of several 'offload'
- ;; hook instance.
- (when (with-machine-lock machine 'upload
+ (when (begin
(register-gc-root (derivation-file-name drv) machine)
(send-files (cons (derivation-file-name drv) inputs)
machine))
@@ -423,9 +420,7 @@ MACHINE."
#:build-timeout build-timeout)))
(if (zero? status)
(begin
- ;; Likewise (see above.)
- (with-machine-lock machine 'download
- (retrieve-files outputs machine))
+ (retrieve-files outputs machine)
(remove-gc-roots machine)
(format (current-error-port)
"done with offloaded '~a'~%"