[no subject]

[Ludovic Courtès]

branch: master
commit 2096ebe63f857fa1e2ebeb5d524e5bb699d9ef61
Author: Ludovic Courtès <address@hidden>
Date:   Sun Mar 18 00:58:19 2018 +0100

    base: Catch errors in the 'process-build-log' handler.
    
    Previously, when an exception was raised from
    'handle-build-event' (e.g., a "database is locked" error), we'd throw,
    thereby leaving PORT open and we'd never read from it again.  Thus, the
    corresponding 'guix-daemon' process would eventually get stuck in a
    'write' call to that socket, and its build processes would stall.
    
    * src/cuirass/base.scm (exception-reporter): New procedure.
    (spawn-builds): Use it.
---
 src/cuirass/base.scm | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/cuirass/base.scm b/src/cuirass/base.scm
index 89f84e9..c0091bc 100644
--- a/src/cuirass/base.scm
+++ b/src/cuirass/base.scm
@@ -360,6 +360,18 @@ outputs are invalid, that they failed to build.)"
 
   (for-each update! lst))
 
+(define (exception-reporter . results)
+  "Return an exception handler that reports the exception on the error port
+and returns the values RESULTS."
+  (lambda (key . args)
+    (false-if-exception
+     (let* ((stack (make-stack #t))
+            (depth (stack-length stack))
+            (frame (or (and (> depth 1) (stack-ref stack 1))
+                       (and (> depth 0)) (stack-ref stack 0))))
+       (print-exception (current-error-port) frame key args)
+       (apply values results)))))
+
 (define* (spawn-builds store db jobs
                        #:key (max-batch-size 200))
   "Build the derivations associated with JOBS, a list of job alists, updating
@@ -412,7 +424,12 @@ MAX-BATCH-SIZE items."
                           (build-derivations& store drv)))
               (process-build-log port
                                  (lambda (event state)
-                                   (handle-build-event db event))
+                                   ;; Catch any errors so we can keep reading
+                                   ;; from PORT and eventually close it.
+                                   (catch #t
+                                     (lambda ()
+                                       (handle-build-event db event))
+                                     (exception-reporter state)))
                                  #t)
               (close-port port)
               (finish)))