summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-04-14 00:24:24 +0200
committerLudovic Courtès <ludo@gnu.org>2014-04-14 00:24:24 +0200
commit30ce8012cd6265b12f756283633be94a547bf990 (patch)
treecfa2c57eb6bc43c0dda8ce1675230656fca18656
parent66ef5411471e8d5f25815b9ab1f360ad56e08544 (diff)
offload: '{send,receive}-files' wait for completion of the transfer.
Fixes situations where the remote 'guix build' is invoked before the .drv has been completely copied, as reported at <https://lists.gnu.org/archive/html/guix-devel/2014-04/msg00174.html>. In some cases 'send-files' would return before the other end is done importing the files, and so the subsequent 'guix build' invocation would just miss the .drv file it refers to. * guix/utils.scm (call-with-decompressed-port): Don't close PORT. (call-with-compressed-output-port): Likewise. * tests/utils.scm ("compressed-output-port + decompressed-port"): Adjust accordingly. * guix/scripts/offload.scm (send-files): Add explicit (close-pipe pipe) call. (retrieve-files): Likewise.
-rw-r--r--guix/scripts/offload.scm7
-rw-r--r--guix/utils.scm8
-rw-r--r--tests/utils.scm6
3 files changed, 11 insertions, 10 deletions
diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm
index e340b7e8cc..d87cad3f23 100644
--- a/guix/scripts/offload.scm
+++ b/guix/scripts/offload.scm
@@ -474,7 +474,9 @@ success, #f otherwise."
(warning (_ "failed while exporting files to '~a': ~a~%")
(build-machine-name machine)
(strerror (system-error-errno args)))))))
- #t))))
+
+ ;; Wait for the 'lsh' process to complete.
+ (zero? (close-pipe pipe))))))
(define (retrieve-files files machine)
"Retrieve FILES from MACHINE's store, and import them."
@@ -502,7 +504,8 @@ success, #f otherwise."
#:log-port (current-error-port)
#:lock? #f)))
- #t)))))
+ ;; Wait for the 'lsh' process to complete.
+ (zero? (close-pipe pipe)))))))
;;;
diff --git a/guix/utils.scm b/guix/utils.scm
index 84cb5ae983..53fc68d27b 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -229,14 +229,12 @@ a symbol such as 'xz."
(define (call-with-decompressed-port compression port proc)
"Call PROC with a wrapper around PORT, a file port, that decompresses data
-read from PORT according to COMPRESSION, a symbol such as 'xz. PORT is closed
-as soon as PROC's dynamic extent is entered."
+read from PORT according to COMPRESSION, a symbol such as 'xz."
(let-values (((decompressed pids)
(decompressed-port compression port)))
(dynamic-wind
(const #f)
(lambda ()
- (close-port port)
(proc decompressed))
(lambda ()
(close-port decompressed)
@@ -286,14 +284,12 @@ of PIDs to wait for."
(define (call-with-compressed-output-port compression port proc)
"Call PROC with a wrapper around PORT, a file port, that compresses data
-that goes to PORT according to COMPRESSION, a symbol such as 'xz. PORT is
-closed as soon as PROC's dynamic extent is entered."
+that goes to PORT according to COMPRESSION, a symbol such as 'xz."
(let-values (((compressed pids)
(compressed-output-port compression port)))
(dynamic-wind
(const #f)
(lambda ()
- (close-port port)
(proc compressed))
(lambda ()
(close-port compressed)
diff --git a/tests/utils.scm b/tests/utils.scm
index 4d2d123c6b..8ad399f75c 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -164,10 +164,12 @@
(false-if-exception (delete-file temp-file))
(test-assert "compressed-output-port + decompressed-port"
(let* ((file (search-path %load-path "guix/derivations.scm"))
- (data (call-with-input-file file get-bytevector-all)))
- (call-with-compressed-output-port 'xz (open-file temp-file "w0b")
+ (data (call-with-input-file file get-bytevector-all))
+ (port (open-file temp-file "w0b")))
+ (call-with-compressed-output-port 'xz port
(lambda (compressed)
(put-bytevector compressed data)))
+ (close-port port)
(bytevector=? data
(call-with-decompressed-port 'xz (open-file temp-file "r0b")