diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-09-13 12:06:15 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-09-13 12:06:15 +0100 |
| commit | e4d0243412f3c4d3581012f3310496538765166b (patch) | |
| tree | 9373b0182591e4516f81da8519105a63a0ab7dee | |
| parent | 555e2cb4a36311a8f4a9780ee72f07d176ece063 (diff) | |
| download | qa-frontpage-e4d0243412f3c4d3581012f3310496538765166b.tar qa-frontpage-e4d0243412f3c4d3581012f3310496538765166b.tar.gz | |
Use timeouts for talking to the data service and build coordinator
| -rw-r--r-- | guix-qa-frontpage/guix-data-service.scm | 6 | ||||
| -rw-r--r-- | guix-qa-frontpage/manage-builds.scm | 24 |
2 files changed, 19 insertions, 11 deletions
diff --git a/guix-qa-frontpage/guix-data-service.scm b/guix-qa-frontpage/guix-data-service.scm index 6266ff1..2af4b46 100644 --- a/guix-qa-frontpage/guix-data-service.scm +++ b/guix-qa-frontpage/guix-data-service.scm @@ -11,6 +11,7 @@ #:use-module (zlib) #:use-module (json) #:use-module ((guix-build-coordinator utils) #:select (retry-on-error)) + #:use-module (guix-qa-frontpage utils) #:use-module (guix-qa-frontpage patchwork) #:use-module (guix-qa-frontpage manage-patch-branches) #:export (&guix-data-service-error @@ -151,7 +152,10 @@ (if (= 0 retry-times) (make-request) (retry-on-error - make-request + (lambda () + (with-fibers-port-timeouts + make-request + #:timeout 120)) #:times retry-times #:delay retry-delay #:ignore (lambda (exn) diff --git a/guix-qa-frontpage/manage-builds.scm b/guix-qa-frontpage/manage-builds.scm index 3d5e917..aafd9cc 100644 --- a/guix-qa-frontpage/manage-builds.scm +++ b/guix-qa-frontpage/manage-builds.scm @@ -12,6 +12,7 @@ #:select (set-thread-name)) #:use-module (guix-build-coordinator utils) #:use-module (guix-build-coordinator client-communication) + #:use-module (guix-qa-frontpage utils) #:use-module (guix-qa-frontpage database) #:use-module (guix-qa-frontpage branch) #:use-module (guix-qa-frontpage patchwork) @@ -411,16 +412,19 @@ (retry-on-error (lambda () (let ((response - (send-submit-build-request - build-coordinator - derivation - (list guix-data-service) - #f - priority - #t - #t - #t - tags))) + (with-fibers-port-timeouts + (lambda () + (send-submit-build-request + build-coordinator + derivation + (list guix-data-service) + #f + priority + #t + #t + #t + tags)) + #:timeout 60))) (let ((no-build-submitted-response (assoc-ref response "no-build-submitted"))) (if no-build-submitted-response |