diff options
| author | Christopher Baines <mail@cbaines.net> | 2022-10-10 14:06:10 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2022-10-10 14:06:10 +0100 |
| commit | 55d4528c9284dd360891c9703f74d346fe0a2a83 (patch) | |
| tree | e1b5816ad729ecb2edabbcb74595407247cb54e0 | |
| parent | 7d0ce41fff0a976034328f9742ed5ea460eb5e50 (diff) | |
| download | build-coordinator-55d4528c9284dd360891c9703f74d346fe0a2a83.tar build-coordinator-55d4528c9284dd360891c9703f74d346fe0a2a83.tar.gz | |
Add system information in to listing the build allocation plan
| -rw-r--r-- | guix-build-coordinator/datastore/sqlite.scm | 8 | ||||
| -rw-r--r-- | scripts/guix-build-coordinator.in | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm index b22ea59..1df58f3 100644 --- a/guix-build-coordinator/datastore/sqlite.scm +++ b/guix-build-coordinator/datastore/sqlite.scm @@ -3269,11 +3269,14 @@ WHERE agent_id = :agent_id" db (string-append " -SELECT builds.uuid, derivations.name, builds.priority, +SELECT builds.uuid, derivations.name, systems.system, + builds.priority, unprocessed_builds_with_derived_priorities.derived_priority FROM builds INNER JOIN derivations ON builds.derivation_id = derivations.id +INNER JOIN systems + ON derivations.system_id = systems.id INNER JOIN build_allocation_plan ON builds.id = build_allocation_plan.build_id LEFT JOIN unprocessed_builds_with_derived_priorities @@ -3297,10 +3300,11 @@ LIMIT :limit" (let ((builds (sqlite-map (match-lambda - (#(uuid derivation_name + (#(uuid derivation_name system priority derived_priority) `((uuid . ,uuid) (derivation_name . ,derivation_name) + (system . ,system) (priority . ,priority) (derived_priority . ,derived_priority) (tags . ,(vector-map diff --git a/scripts/guix-build-coordinator.in b/scripts/guix-build-coordinator.in index f36dc00..5e02daf 100644 --- a/scripts/guix-build-coordinator.in +++ b/scripts/guix-build-coordinator.in @@ -866,6 +866,8 @@ tags: (simple-format #t "~A: ~A\n" index (assoc-ref build "uuid")) (simple-format #t " derivation name: ~A\n" (assoc-ref build "derivation_name")) + (simple-format #t " system: ~A\n" + (assoc-ref build "system")) (simple-format #t " priority: ~A\n" (assoc-ref build "priority")) (simple-format #t " derived priority: ~A\n" |