guix: store: Enable specifying the builtin builders.

To open-connection and port->connection.  This overrides the discovered
builtin builders that the daemon says it provides.

This is useful when you want to generate compatible derivations that can be
run with a daemon that potentially doesn't support builtin builders that the
daemon you're using to generate the derivations has.

I'm looking at this in particular because I want to use this in the data
service, since it provides substitutes for derivations, and since these can be
built on other machines, it's useful to control which builtin builders they
depend on.

* guix/store.scm (open-connection, port->connection): Accept
 #:built-in-builders and use this instead of %built-in-builders.

Fixes: <https://issues.guix.gnu.org/67250>.

Change-Id: I45d58ab93b6d276d280552858fc81ebc2b58828a
This commit is contained in:
Christopher Baines 2024-06-24 14:43:45 +01:00
parent ee7e5e00bf
commit f002371767
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577

View file

@ -566,7 +566,7 @@ (define (not-supported)
(define* (open-connection #:optional (uri (%daemon-socket-uri)) (define* (open-connection #:optional (uri (%daemon-socket-uri))
#:key port (reserve-space? #t) cpu-affinity #:key port (reserve-space? #t) cpu-affinity
non-blocking?) non-blocking? built-in-builders)
"Connect to the daemon at URI (a string), or, if PORT is not #f, use it as "Connect to the daemon at URI (a string), or, if PORT is not #f, use it as
the I/O port over which to communicate to a build daemon. the I/O port over which to communicate to a build daemon.
@ -575,8 +575,10 @@ (define* (open-connection #:optional (uri (%daemon-socket-uri))
should the disk become full. When CPU-AFFINITY is true, it must be an integer 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 corresponding to an OS-level CPU number to which the daemon's worker process
for this connection will be pinned. If NON-BLOCKING?, use a non-blocking for this connection will be pinned. If NON-BLOCKING?, use a non-blocking
socket when using the file, unix or guix URI schemes. Return a server socket when using the file, unix or guix URI schemes. If
object." BUILT-IN-BUILDERS is provided, it should be a list of strings
and this will be used instead of the builtin builders provided by the build
daemon. Return a server object."
(define (handshake-error) (define (handshake-error)
(raise (condition (raise (condition
(&store-connection-error (file (or port uri)) (&store-connection-error (file (or port uri))
@ -610,8 +612,10 @@ (define (handshake-error)
(write-int cpu-affinity port))) (write-int cpu-affinity port)))
(when (>= (protocol-minor v) 11) (when (>= (protocol-minor v) 11)
(write-int (if reserve-space? 1 0) port)) (write-int (if reserve-space? 1 0) port))
(letrec* ((built-in-builders (letrec* ((actual-built-in-builders
(delay (%built-in-builders conn))) (if built-in-builders
(delay built-in-builders)
(delay (%built-in-builders conn))))
(caches (caches
(make-vector (make-vector
(atomic-box-ref %store-connection-caches) (atomic-box-ref %store-connection-caches)
@ -624,15 +628,19 @@ (define (handshake-error)
(make-hash-table 100) (make-hash-table 100)
(make-hash-table 100) (make-hash-table 100)
caches caches
built-in-builders))) actual-built-in-builders)))
(let loop ((done? (process-stderr conn))) (let loop ((done? (process-stderr conn)))
(or done? (process-stderr conn))) (or done? (process-stderr conn)))
conn)))))) conn))))))
(define* (port->connection port (define* (port->connection port
#:key (version %protocol-version)) #:key (version %protocol-version)
built-in-builders)
"Assimilate PORT, an input/output port, and return a connection to the "Assimilate PORT, an input/output port, and return a connection to the
daemon, assuming the given protocol VERSION. daemon, assuming the given protocol VERSION. If
BUILT-IN-BUILDERS is provided, it should be a list of strings
and this will be used instead of the builtin builders provided by the build
daemon.
Warning: this procedure assumes that the initial handshake with the daemon has Warning: this procedure assumes that the initial handshake with the daemon has
already taken place on PORT and that we're just continuing on this established already taken place on PORT and that we're just continuing on this established
@ -649,7 +657,9 @@ (define connection
(make-vector (make-vector
(atomic-box-ref %store-connection-caches) (atomic-box-ref %store-connection-caches)
vlist-null) vlist-null)
(delay (%built-in-builders connection)))) (if built-in-builders
(delay built-in-builders)
(delay (%built-in-builders connection)))))
connection)) connection))