diff options
Diffstat (limited to 'guix-build-coordinator')
| -rw-r--r-- | guix-build-coordinator/agent.scm | 25 | ||||
| -rw-r--r-- | guix-build-coordinator/utils.scm | 8 |
2 files changed, 22 insertions, 11 deletions
diff --git a/guix-build-coordinator/agent.scm b/guix-build-coordinator/agent.scm index 3209dd8..004e2e8 100644 --- a/guix-build-coordinator/agent.scm +++ b/guix-build-coordinator/agent.scm @@ -205,9 +205,14 @@ output-paths)) (path-substitutes (begin - (when non-derivation-substitute-urls - (set-build-options store #:substitute-urls - non-derivation-substitute-urls)) + (apply set-build-options + store + `(,@(if non-derivation-substitute-urls + (list #:substitute-urls + non-derivation-substitute-urls) + '()) + #:max-silent-time 60 + #:timeout ,(* 10 60))) (unless non-derivation-substitute-urls (log-msg lgr 'WARN @@ -244,15 +249,19 @@ but the guix-daemon claims it's unavailable") (begin (retry-on-error (lambda () - (with-timeout (* 1000 60 10) ; 10 minutes + (with-timeout (* 1000 60 11) ; 11 minutes (raise-exception (make-exception-with-message "timeout fetching inputs")) (begin ;; Download the substitutes - (when non-derivation-substitute-urls - (set-build-options store - #:substitute-urls - non-derivation-substitute-urls)) + (apply set-build-options + store + `(,@(if non-derivation-substitute-urls + (list #:substitute-urls + non-derivation-substitute-urls) + '()) + #:max-silent-time 60 + #:timeout ,(* 10 60))) (let ((log-port (open-output-string))) (with-throw-handler #t diff --git a/guix-build-coordinator/utils.scm b/guix-build-coordinator/utils.scm index 7b0900b..7f24ada 100644 --- a/guix-build-coordinator/utils.scm +++ b/guix-build-coordinator/utils.scm @@ -339,9 +339,11 @@ upcoming chunk." (with-store store (apply set-build-options store - (if substitute-urls - `(#:substitute-urls ,substitute-urls) - '())) + `(,@(if substitute-urls + `(#:substitute-urls ,substitute-urls) + '()) + #:max-silent-time 60 + #:timeout ,(* 10 60))) (parameterize ((current-build-output-port log-port)) (ensure-path store derivation-name))) |