Avoid substituting derivations when builds are submitted

When the derivation substitute URLs are known. This avoids having to add the
derivation to the store, which can be blocked by garbage collection.

1 files changed, 20 insertions, 15 deletions

diff --git a/guix-build-coordinator/client-communication.scm b/guix-build-coordinator/client-communication.scm
index fec53e3..27f98ff 100644
--- a/guix-build-coordinator/client-communication.scm
+++ b/guix-build-coordinator/client-communication.scm
@@ -377,33 +377,38 @@
                                 (string->number val)))
                        1000)))))))))
       (('POST "builds")
-       (let ((derivation-file (assoc-ref body "derivation")))
+       (let ((derivation-file (assoc-ref body "derivation"))
+             (substitute-urls
+              (and=> (assoc-ref body "substitute-urls")
+                     vector->list)))
          (unless (string? derivation-file)
            (raise-exception
             (make-exception-with-message
              (simple-format #f "derivation must be a string: ~A\n"
                             derivation))))
 
-         (let ((derivation-database-entry
-                (datastore-find-derivation datastore derivation-file)))
-           (unless derivation-database-entry
-             (unless (with-store store
-                       (valid-path? store derivation-file))
-               (call-with-worker-thread
-                substitutes-channel
-                (lambda ()
-                  (let ((raw-substitute-urls
-                         (assoc-ref body "substitute-urls")))
-                    (substitute-derivation derivation-file
-                                           #:substitute-urls
-                                           (and=> raw-substitute-urls
-                                                  vector->list))))))))
+         (define (read-drv/substitute derivation-file)
+           (unless (with-store store
+                     (valid-path? store derivation-file))
+             (call-with-worker-thread
+              substitutes-channel
+              (lambda ()
+                (substitute-derivation derivation-file
+                                       #:substitute-urls substitute-urls)))
+             (read-derivation-from-file derivation-file)))
 
          (let ((submit-build-result
                 (apply
                  submit-build
                  `(,build-coordinator
                    ,derivation-file
+                   #:read-drv
+                   ,(if (null? (or substitute-urls '()))
+                        read-drv/substitute
+                        (lambda (derivation-file)
+                          (read-derivation-through-substitutes
+                           derivation-file
+                           substitute-urls)))
                    ,@(let ((priority (assoc-ref body "priority")))
                        (if priority
                            `(#:priority ,priority)