diff options
| author | Christopher Baines <mail@cbaines.net> | 2022-04-23 22:30:15 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2022-04-23 22:30:15 +0100 |
| commit | 13a7765f090c37f895054bee059d68cbf205a0da (patch) | |
| tree | f8b0a7c598adb16f137931df94f6d666892d4643 /guix-build-coordinator | |
| parent | 769f030fc84f91cc95f4fadb1b54938723f87860 (diff) | |
| download | build-coordinator-13a7765f090c37f895054bee059d68cbf205a0da.tar build-coordinator-13a7765f090c37f895054bee059d68cbf205a0da.tar.gz | |
Take the max of the derived priority and priority
I believe this fixes an issue where the derived priority could be lower than
the priority, if the build being inserted isn't at the edge of the derivation
graph.
Diffstat (limited to 'guix-build-coordinator')
| -rw-r--r-- | guix-build-coordinator/datastore/sqlite.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm index 70982db..9ea2845 100644 --- a/guix-build-coordinator/datastore/sqlite.scm +++ b/guix-build-coordinator/datastore/sqlite.scm @@ -3762,10 +3762,11 @@ WHERE build_id = :build_id" (lambda (db) (let* ((build-id (insert-build db drv-name uuid priority defer-until)) - (derived-priority (or (call-with-delay-logging - get-derived-priority - #:args (list db build-id)) - priority)) + (derived-priority (max (or (call-with-delay-logging + get-derived-priority + #:args (list db build-id)) + priority) + priority)) (all-inputs-built? (all-inputs-built? db build-id))) (insert-unprocessed-builds-with-derived-priorities-entry |