ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

offload: '{send,receive}-files' wait for completion of the transfer.

Browse source 
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.
This commit is contained in:
Ludovic Courtès 2014-04-14 00:24:24 +02:00
parent 66ef541147
commit 30ce8012cd
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
guix/scripts/offload.scm
View file

@ -474,7 +474,9 @@ (define (missing-files files)
(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 @@ (define host
#:log-port (current-error-port)
#:lock? #f)))
#t)))))
;; Wait for the 'lsh' process to complete.
(zero? (close-pipe pipe)))))))
;;;

8
guix/utils.scm
View file

@ -229,14 +229,12 @@ (define (compressed-port compression input)
(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 @@ (define (compressed-output-port compression output)
(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)

6
tests/utils.scm
View file

@ -164,10 +164,12 @@ (define temp-file
(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")