diff options
| author | Christopher Baines <mail@cbaines.net> | 2025-01-15 09:52:35 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2025-01-15 09:56:02 +0000 |
| commit | 7eb6ecad67c15fcd3927a1bd6cc5a8c95ce2dd43 (patch) | |
| tree | d6cb41b6e69d1180fffa598ed81e811aa3f5d7be /guix-build-coordinator | |
| parent | 44c81082c34c6d819743cf452db8d1769301805a (diff) | |
| download | build-coordinator-7eb6ecad67c15fcd3927a1bd6cc5a8c95ce2dd43.tar build-coordinator-7eb6ecad67c15fcd3927a1bd6cc5a8c95ce2dd43.tar.gz | |
Don't use a default timeout to avoid confusion
Since with-port-timeouts is both from Knots and the build coordinator.
Diffstat (limited to 'guix-build-coordinator')
| -rw-r--r-- | guix-build-coordinator/agent-messaging/http.scm | 3 | ||||
| -rw-r--r-- | guix-build-coordinator/guix-data-service.scm | 3 | ||||
| -rw-r--r-- | guix-build-coordinator/hooks.scm | 3 | ||||
| -rw-r--r-- | guix-build-coordinator/utils.scm | 3 | ||||
| -rw-r--r-- | guix-build-coordinator/utils/timeout.scm | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/guix-build-coordinator/agent-messaging/http.scm b/guix-build-coordinator/agent-messaging/http.scm index 5534ea4..66250a1 100644 --- a/guix-build-coordinator/agent-messaging/http.scm +++ b/guix-build-coordinator/agent-messaging/http.scm @@ -205,7 +205,8 @@ response))))) (retry-on-error (lambda () - (with-port-timeouts make-request)) + (with-port-timeouts make-request + #:timeout 120)) #:times retry-times #:delay 10 #:no-retry agent-error-from-coordinator?)) diff --git a/guix-build-coordinator/guix-data-service.scm b/guix-build-coordinator/guix-data-service.scm index 2899870..d4f6ea6 100644 --- a/guix-build-coordinator/guix-data-service.scm +++ b/guix-build-coordinator/guix-data-service.scm @@ -52,7 +52,8 @@ #:body body ;; Guile doesn't treat JSON as text, so decode the ;; body manually - #:decode-body? #f)))) + #:decode-body? #f)) + #:timeout 120)) (code (response-code response))) (unless (and (>= code 200) diff --git a/guix-build-coordinator/hooks.scm b/guix-build-coordinator/hooks.scm index c435a92..cedaf9d 100644 --- a/guix-build-coordinator/hooks.scm +++ b/guix-build-coordinator/hooks.scm @@ -157,7 +157,8 @@ (substitute-derivation store drv-name #:substitute-urls - derivation-substitute-urls))) + derivation-substitute-urls)) + #:timeout 120) (add-temp-root store drv-name)) (let* ((drv (read-derivation-from-file* drv-name)) diff --git a/guix-build-coordinator/utils.scm b/guix-build-coordinator/utils.scm index fe8c453..f0b91cb 100644 --- a/guix-build-coordinator/utils.scm +++ b/guix-build-coordinator/utils.scm @@ -213,7 +213,8 @@ (let ((body (read-response-body response))) (close-port port) (values response - body))))))))))) + body))))))))) + #:timeout 120)) (define (find-missing-substitutes-for-output store substitute-urls output) (if (valid-path? store output) diff --git a/guix-build-coordinator/utils/timeout.scm b/guix-build-coordinator/utils/timeout.scm index 37e893c..bb133d7 100644 --- a/guix-build-coordinator/utils/timeout.scm +++ b/guix-build-coordinator/utils/timeout.scm @@ -45,7 +45,7 @@ (define port-write-timeout-error? (record-predicate &port-write-timeout)) -(define* (with-port-timeouts thunk #:key (timeout 120)) +(define* (with-port-timeouts thunk #:key timeout) ;; When the GC runs, it restarts the poll syscall, but the timeout remains ;; unchanged! When the timeout is longer than the time between the syscall |