From 98c393164167e9a5a205f7dffa966992a71925ae Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 10 May 2023 11:06:20 +0100 Subject: [PATCH] services: guix-build-coordinator-agent: Support max-parallel-uploads. This should be usable with the new guile-gnutls. * gnu/services/guix.scm (guix-build-coordinator-agent-configuration-max-parallel-uploads): New procedure. * gnu/services/guix.scm (guix-build-coordinator-agent-shepherd-services): Use the new argument. * doc/guix.texi (Guix Services): Document it. --- doc/guix.texi | 3 +++ gnu/services/guix.scm | 14 +++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index a7be6c8712..ef2b78baeb 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -37257,6 +37257,9 @@ will use the current system it's running on as the default. @item @code{max-parallel-builds} (default: @code{1}) The number of builds to perform in parallel. +@item @code{max-parallel-uploads} (default: @code{1}) +The number of uploads to perform in parallel. + @item @code{max-allocated-builds} (default: @code{#f}) The maximum number of builds this agent can be allocated. diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index b5740892c4..90310ab9d9 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -60,6 +60,7 @@ guix-build-coordinator-agent-configuration-authentication guix-build-coordinator-agent-configuration-systems guix-build-coordinator-agent-configuration-max-parallel-builds + guix-build-coordinator-agent-configuration-max-parallel-uploads guix-build-coordinator-agent-configuration-max-allocated-builds guix-build-coordinator-agent-configuration-max-1min-load-average guix-build-coordinator-agent-configuration-derivation-substitute-urls @@ -193,6 +194,9 @@ (max-parallel-builds guix-build-coordinator-agent-configuration-max-parallel-builds (default 1)) + (max-parallel-uploads + guix-build-coordinator-agent-configuration-max-parallel-uploads + (default 1)) (max-allocated-builds guix-build-coordinator-agent-configuration-max-allocated-builds (default #f)) @@ -426,9 +430,9 @@ (define (guix-build-coordinator-agent-shepherd-services config) (match-record config - (package user coordinator authentication max-parallel-builds - max-allocated-builds - max-1min-load-average + (package user coordinator authentication + max-parallel-builds max-parallel-uploads + max-allocated-builds max-1min-load-average derivation-substitute-urls non-derivation-substitute-urls systems) (list @@ -464,6 +468,10 @@ token-file)))) #$(simple-format #f "--max-parallel-builds=~A" max-parallel-builds) + #$@(if max-parallel-uploads + #~(#$(simple-format #f "--max-parallel-uploads=~A" + max-parallel-uploads)) + #~()) #$@(if max-allocated-builds #~(#$(simple-format #f "--max-allocated-builds=~A" max-allocated-builds))