Update use of resource pools

guix-data-service/jobs/load-new-guix-revision.scm

@@ -1905,8 +1905,7 @@ SELECT 1 FROM derivation_source_file_nars WHERE derivation_source_file_id = $1"
                                            'load-new-guix-revision-inserts))
        db-conn)
      1
-     #:name "postgres"
+     #:name "postgres"))
-     #:min-size 0))
 
   (define package-ids-promise
     (fibers-delay
@@ -2265,8 +2264,7 @@ SELECT 1 FROM derivation_source_file_nars WHERE derivation_source_file_id = $1"
                 (make-resource-pool
                  (const channel-instances-conn)
                  1
-                 #:name "postgres"
+                 #:name "postgres")))
-                 #:min-size 0)))
 
           (unless existing-guix-revision-id
             (let* ((derivations-by-system
@@ -2843,8 +2841,6 @@ SKIP LOCKED")
 
        (%thread-pool-default-timeout #f)
 
-       (resource-pool-retry-checkout-timeout 120)
-
        (add-hook! after-gc-hook
                   (lambda ()
                     (simple-format (current-error-port)

guix-data-service/web/build-server/controller.scm

@@ -125,25 +125,23 @@
   (define (spawn-fiber-for-handler handler)
     (spawn-fiber
      (lambda ()
-       (parameterize
+       (call-with-resource-from-pool (background-connection-pool)
-           ((resource-pool-retry-checkout-timeout (* 60 60 6)))
+         (lambda (conn)
-         (call-with-resource-from-pool (background-connection-pool)
+           (with-exception-handler
-           (lambda (conn)
+               (lambda (exn)
-             (with-exception-handler
+                 (simple-format
-                 (lambda (exn)
+                  (current-error-port)
-                   (simple-format
+                  "exception in build event handler: ~A\n"
-                    (current-error-port)
+                  exn))
-                    "exception in build event handler: ~A\n"
+             (lambda ()
-                    exn))
+               (with-throw-handler #t
-               (lambda ()
+                 (lambda ()
-                 (with-throw-handler #t
+                   (handler conn))
-                   (lambda ()
+                 (lambda _
-                     (handler conn))
+                   (display (backtrace) (current-error-port))
-                   (lambda _
+                   (display "\n" (current-error-port)))))
-                     (display (backtrace) (current-error-port))
+             #:unwind? #t))
-                     (display "\n" (current-error-port)))))
+         #:timeout #f))))
-               #:unwind? #t))
-           #:timeout #f)))))
 
   (define (with-build-ids-for-status data
                                      build-ids

guix-data-service/web/controller.scm

@@ -814,9 +814,7 @@
      (('GET "builds")
       (delegate-to build-controller))
      (('GET "metrics")
-      (parameterize
+      (render-metrics))
-          ((resource-pool-default-timeout 6))
-        (render-metrics)))
      (('GET "revision" args ...)
       (delegate-to revision-controller))
      (('GET "repositories")

guix-data-service/web/server.scm

@@ -210,9 +210,8 @@ port. Also, the port used can be changed by passing the --port option.\n"
                        #:destructor
                        (lambda (conn)
                          (close-postgresql-connection conn "web-reserved"))
-                       #:scheduler priority-scheduler))
+                       #:default-checkout-timeout 6
-
+                       #:scheduler priority-scheduler)))
-                     (resource-pool-default-timeout 6))
 
                   (let ((resource-pool-checkout-failures-metric
                          (make-counter-metric registry