TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

store: 'open-connection' never returns #f.

Browse source 
* guix/store.scm (open-connection)[handshake-error]: New procedure.
Call it in code paths that would previously return #f.
This commit is contained in:
Ludovic Courtès 2021-05-05 23:03:40 +02:00
parent 5b0afe2420
commit e3e0886c2d
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
guix/store.scm
View file

@ -548,13 +548,16 @@ (define* (open-connection #:optional (uri (%daemon-socket-uri))
should the disk become full. When CPU-AFFINITY is true, it must be an integer
corresponding to an OS-level CPU number to which the daemon's worker process
for this connection will be pinned. Return a server object."
(define (handshake-error)
(raise (condition
(&store-connection-error (file (or port uri))
(errno EPROTO))
(&message (message "build daemon handshake failed")))))
(guard (c ((nar-error? c)
;; One of the 'write-' or 'read-' calls below failed, but this is
;; really a connection error.
(raise (condition
(&store-connection-error (file (or port uri))
(errno EPROTO))
(&message (message "build daemon handshake failed"))))))
(handshake-error)))
(let*-values (((port)
(or port (connect-to-daemon uri)))
((output flush)
@ -562,32 +565,35 @@ (define* (open-connection #:optional (uri (%daemon-socket-uri))
(make-bytevector 8192))))
(write-int %worker-magic-1 port)
(let ((r (read-int port)))
(and (= r %worker-magic-2)
(let ((v (read-int port)))
(and (= (protocol-major %protocol-version)
(protocol-major v))
(begin
(write-int %protocol-version port)
(when (>= (protocol-minor v) 14)
(write-int (if cpu-affinity 1 0) port)
(when cpu-affinity
(write-int cpu-affinity port)))
(when (>= (protocol-minor v) 11)
(write-int (if reserve-space? 1 0) port))
(letrec* ((built-in-builders
(delay (%built-in-builders conn)))
(conn
(%make-store-connection port
(protocol-major v)
(protocol-minor v)
output flush
(make-hash-table 100)
(make-hash-table 100)
vlist-null
built-in-builders)))
(let loop ((done? (process-stderr conn)))
(or done? (process-stderr conn)))
conn)))))))))
(unless (= r %worker-magic-2)
(handshake-error))
(let ((v (read-int port)))
(unless (= (protocol-major %protocol-version)
(protocol-major v))
(handshake-error))
(write-int %protocol-version port)
(when (>= (protocol-minor v) 14)
(write-int (if cpu-affinity 1 0) port)
(when cpu-affinity
(write-int cpu-affinity port)))
(when (>= (protocol-minor v) 11)
(write-int (if reserve-space? 1 0) port))
(letrec* ((built-in-builders
(delay (%built-in-builders conn)))
(conn
(%make-store-connection port
(protocol-major v)
(protocol-minor v)
output flush
(make-hash-table 100)
(make-hash-table 100)
vlist-null
built-in-builders)))
(let loop ((done? (process-stderr conn)))
(or done? (process-stderr conn)))
conn))))))
(define* (port->connection port
#:key (version %protocol-version))