diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-05-15 12:49:27 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-05-15 13:02:39 +0100 |
| commit | aaceb4715a8d68443f96d6c35ead35a317846de6 (patch) | |
| tree | c1f020291bd7fa012c5bdb8d357eb96a550e5564 | |
| parent | b587796f41261293cd1d8f3aecb0adc369a7466a (diff) | |
| download | qa-frontpage-aaceb4715a8d68443f96d6c35ead35a317846de6.tar qa-frontpage-aaceb4715a8d68443f96d6c35ead35a317846de6.tar.gz | |
Submit branch builds via a fiber
Rather than a thread.
| -rw-r--r-- | guix-qa-frontpage/manage-builds.scm | 17 | ||||
| -rw-r--r-- | guix-qa-frontpage/server.scm | 6 | ||||
| -rw-r--r-- | scripts/guix-qa-frontpage.in | 4 |
3 files changed, 11 insertions, 16 deletions
diff --git a/guix-qa-frontpage/manage-builds.scm b/guix-qa-frontpage/manage-builds.scm index 070681d..5727648 100644 --- a/guix-qa-frontpage/manage-builds.scm +++ b/guix-qa-frontpage/manage-builds.scm @@ -34,7 +34,7 @@ submit-builds-for-branch start-submit-patch-builds-fiber - start-submit-branch-builds-thread + start-submit-branch-builds-fiber start-submit-master-branch-system-tests-thread)) (define %systems-to-submit-builds-for @@ -352,10 +352,10 @@ lst (take lst n))) -(define (start-submit-branch-builds-thread database - build-coordinator - guix-data-service - metrics-registry) +(define (start-submit-branch-builds-fiber database + build-coordinator + guix-data-service + metrics-registry) (define (cancel-branch-builds branches) (for-each (lambda (branch) @@ -440,13 +440,8 @@ (current-error-port) "waiting for master branch substitutes before submitting branch builds\n"))))))) - (call-with-new-thread + (spawn-fiber (lambda () - (catch 'system-error - (lambda () - (set-thread-name "branch builds")) - (const #t)) - (while #t (with-exception-handler (lambda (exn) diff --git a/guix-qa-frontpage/server.scm b/guix-qa-frontpage/server.scm index e7b25d6..22ad477 100644 --- a/guix-qa-frontpage/server.scm +++ b/guix-qa-frontpage/server.scm @@ -848,7 +848,11 @@ has no patches or has been closed.") "https://data.qa.guix.gnu.org" metrics-registry #:series-count - patch-issues-to-show)) + patch-issues-to-show) + (start-submit-branch-builds-fiber database + "http://127.0.0.1:8746" + "https://data.qa.guix.gnu.org" + metrics-registry)) (wait finished?)) #:parallelism 1))) diff --git a/scripts/guix-qa-frontpage.in b/scripts/guix-qa-frontpage.in index 488a0b0..9104696 100644 --- a/scripts/guix-qa-frontpage.in +++ b/scripts/guix-qa-frontpage.in @@ -282,10 +282,6 @@ metrics-registry) (when (assq-ref opts 'submit-builds) - (start-submit-branch-builds-thread database - "http://127.0.0.1:8746" - "https://data.qa.guix.gnu.org" - metrics-registry) (start-submit-master-branch-system-tests-thread database "http://127.0.0.1:8746" |