From 05822859d115cf307bb8763bcccb7c572f5ff228 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Fri, 26 Apr 2019 18:59:33 +0100
Subject: WIP

---
 error                                             | 45 +++++++++++++++++++++++
 guix-data-service/jobs/load-new-guix-revision.scm | 34 +++++++++++------
 2 files changed, 68 insertions(+), 11 deletions(-)
 create mode 100644 error

diff --git a/error b/error
new file mode 100644
index 0000000..e50bc9e
--- /dev/null
+++ b/error
@@ -0,0 +1,45 @@
+Processing job 1587 (url: https://git.cbaines.net/git/guix/patches.git, commit: c983878417be5d832f5c90c1af270ea33aa2fe10, source: Patchwork series 945 head commit)
+
+
+
+
+
+debug: Starting getting derivations for ((x86_64-linux . x86_64-linux))
+error: while processing julia ignoring error: (system-error lstat ~A: ~S (No such file or directory ./patches/llvm-6.0-D44650.patch) (2))
+error: while processing jrnl ignoring error: (srfi-34 #<condition &store-protocol-error [message: "bad archive: expected open tag" status: 1] b0d6030>)
+Backtrace:
+          16 (primitive-load "/home/chris/Projects/Guix/guix-data-se…")
+In ice-9/boot-9.scm:
+    841:4 15 (with-throw-handler _ _ _)
+In guix-data-service/database.scm:
+    35:22 14 (_)
+In guix-data-service/jobs.scm:
+      8:4 13 (process-jobs #<pg-conn 162d4d0 (disconnected)>)
+In guix-data-service/jobs/load-new-guix-revision.scm:
+    414:9 12 (process-next-load-new-guix-revision-job #<pg-conn 162d…>)
+   374:15 11 (load-new-guix-revision _ _ _)
+   350:11 10 (extract-information-from _ #<pg-conn 162d4d0 (disconn…> …)
+   188:10  9 (inferior-guix->package-derivation-ids #<store-connect…> …)
+    33:17  8 (log-time "getting inferior derivations" #<procedure 3c…>)
+In srfi/srfi-1.scm:
+   679:15  7 (append-map _ _ . _)
+   592:17  6 (map1 ((("x86_64-linux" . "x86_64-linux")) (("…" . #)) …))
+In guix-data-service/jobs/load-new-guix-revision.scm:
+    33:17  5 (log-time "getting derivations for ((x86_64-linux . x8…" …)
+In guix/utils.scm:
+    632:8  4 (call-with-temporary-directory #<procedure 3cbff2d0 at…> …)
+In guix/inferior.scm:
+   547:10  3 (_ _)
+    501:9  2 (proxy #<input-output: socket 14> #<input-output: socke…>)
+In unknown file:
+           1 (get-bytevector-some #<input-output: socket 11>)
+In ice-9/boot-9.scm:
+   752:25  0 (dispatch-exception _ _ _)
+
+ice-9/boot-9.scm:752:25: In procedure dispatch-exception:
+In procedure fport_read: Connection reset by peer
+error: while processing jpegoptim ignoring error: (srfi-34 #<condition &nar-error [file: #f port: #<input-output: socket 20>] b179fc0>)
+error: while processing jp2a ignoring error: (system-error fport_write ~A (Broken pipe) (32))
+error: while processing jose ignoring error: (system-error fport_write ~A (Broken pipe) (32))
+error: while processing john-the-ripper-jumbo ignoring error: (system-error fport_write ~A (Broken pipe) (32))
+
diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm
index 4218849..4d9ac4d 100644
--- a/guix-data-service/jobs/load-new-guix-revision.scm
+++ b/guix-data-service/jobs/load-new-guix-revision.scm
@@ -346,20 +346,32 @@
     (inferior-eval '(%graft? #f) inf)
 
     (exec-query conn "BEGIN")
-    (let ((package-derivation-ids
-           (inferior-guix->package-derivation-ids store conn inf))
-          (guix-revision-id
-           (insert-guix-revision conn url commit store-path)))
+    (with-throw-handler
+        #t
+      (lambda ()
+        (let ((package-derivation-ids
+               (inferior-guix->package-derivation-ids store conn inf))
+              (guix-revision-id
+               (insert-guix-revision conn url commit store-path)))
 
-      (insert-guix-revision-package-derivations conn
-                                                guix-revision-id
-                                                package-derivation-ids)
+          (insert-guix-revision-package-derivations conn
+                                                    guix-revision-id
+                                                    package-derivation-ids)
 
-      (exec-query conn "COMMIT")
+          (exec-query conn "COMMIT")
 
-      (simple-format
-       #t "Successfully loaded ~A package/derivation pairs\n"
-       (length package-derivation-ids)))))
+          (simple-format
+           #t "Successfully loaded ~A package/derivation pairs\n"
+           (length package-derivation-ids))))
+      (lambda (key . args)
+        (simple-format (current-error-port)
+                       "Failed extracting information: ~A ~A\n"
+                       key args)
+        (kill ((@@ (guix inferior) inferior-pid) inf) SIGINT)
+        (simple-format (current-error-port)
+                       "killed inferior\n\n")
+        (exec-query conn "ROLLBACK")
+        (simple-format (current-error-port) "FINISHED CLEAN UP\n\n")))))
 
 (define (load-new-guix-revision conn url commit)
   (if (guix-revision-exists? conn url commit)
-- 
cgit v1.2.3