From 940a8c57be7ecdd139ba450765f0cc26de5b8ec7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 29 Oct 2014 00:28:03 +0100 Subject: offload: Remove mutual exclusion on transfers. Suggested by Mark H. Weaver at . * guix/scripts/offload.scm (transfer-and-offload): Remove uses of 'with-machine-lock'. --- guix/scripts/offload.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'guix/scripts/offload.scm') 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'~%" -- cgit v1.2.3