diff options
| author | Christopher Baines <mail@cbaines.net> | 2020-05-10 17:02:01 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2020-05-10 17:02:01 +0100 |
| commit | 542e606211c0129691bd4d843505212abf6ec1ce (patch) | |
| tree | 955a0257c4a965b5d02b323e39b7ced24318e597 | |
| parent | 3d7f31bf2637e1211e089ec5642f6cfe05539e90 (diff) | |
| download | build-coordinator-542e606211c0129691bd4d843505212abf6ec1ce.tar build-coordinator-542e606211c0129691bd4d843505212abf6ec1ce.tar.gz | |
Fix datastore-fetch-input-builds-for-unprocessed-builds
Previously it was ignoring outputs without builds or build results. This fixes
that.
| -rw-r--r-- | guix-build-coordinator/build-allocator.scm | 6 | ||||
| -rw-r--r-- | guix-build-coordinator/datastore/sqlite.scm | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/guix-build-coordinator/build-allocator.scm b/guix-build-coordinator/build-allocator.scm index 70aa59c..265de93 100644 --- a/guix-build-coordinator/build-allocator.scm +++ b/guix-build-coordinator/build-allocator.scm @@ -373,8 +373,10 @@ (every (match-lambda ((output . builds) (if (any (lambda (output-build) - (string=? (assq-ref output-build 'result) - "success")) + (string=? + (or (assq-ref output-build 'result) + "unknown") + "success")) builds) #t #f))) diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm index 138decc..e418500 100644 --- a/guix-build-coordinator/datastore/sqlite.scm +++ b/guix-build-coordinator/datastore/sqlite.scm @@ -911,9 +911,9 @@ INNER JOIN derivation_outputs ON derivation_inputs.derivation_output_id = derivation_outputs.id INNER JOIN derivation_outputs AS input_build_derivation_outputs ON derivation_outputs.output = input_build_derivation_outputs.output -INNER JOIN builds AS input_builds +LEFT JOIN builds AS input_builds ON input_builds.derivation_name = input_build_derivation_outputs.derivation_name -INNER JOIN build_results AS input_build_results +LEFT JOIN build_results AS input_build_results ON input_builds.uuid = input_build_results.build_id WHERE builds.processed = 0"))) |