diff options
| author | Christopher Baines <mail@cbaines.net> | 2022-01-19 13:14:39 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2022-01-19 13:14:39 +0000 |
| commit | 75c00fc1705d2f11b4e2972f0f1ce925db0d0a5c (patch) | |
| tree | a96b345f3f111fbe0cc2796b425c9648de94ac4e /guix-build-coordinator/agent.scm | |
| parent | 4b8426b7e2833479f8e471315ab904fc8d83b1f7 (diff) | |
| download | build-coordinator-75c00fc1705d2f11b4e2972f0f1ce925db0d0a5c.tar build-coordinator-75c00fc1705d2f11b4e2972f0f1ce925db0d0a5c.tar.gz | |
Don't require reading the derivation after the build has happened
As it might have been garbage collected.
Diffstat (limited to 'guix-build-coordinator/agent.scm')
| -rw-r--r-- | guix-build-coordinator/agent.scm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/guix-build-coordinator/agent.scm b/guix-build-coordinator/agent.scm index e38001f..2f3e561 100644 --- a/guix-build-coordinator/agent.scm +++ b/guix-build-coordinator/agent.scm @@ -285,7 +285,8 @@ (report-build-start coordinator-interface build-id #:log (build-log-procedure lgr build-id)) - (let* ((result (perform-build lgr store build-id derivation-name)) + (let* ((derivation (read-derivation-from-file derivation-name)) + (result (perform-build lgr store build-id derivation-name)) ;; TODO Check this handles timezones right (end-time (localtime (time-second (current-time)) "UTC")) (compressed-outputs @@ -303,7 +304,7 @@ (post-build-success lgr coordinator-interface build-id - derivation-name + derivation end-time submit-outputs? compressed-outputs @@ -311,7 +312,6 @@ (post-build-failure lgr coordinator-interface build-id - derivation-name end-time)) (log-msg lgr 'INFO build-id @@ -776,7 +776,7 @@ but the guix-daemon claims it's unavailable" (define (post-build-failure lgr coordinator-interface - build-id derivation end-time) + build-id end-time) (log-msg lgr 'INFO build-id ": build failed") (with-exception-handler (lambda (exn) @@ -818,7 +818,7 @@ but the guix-daemon claims it's unavailable" compressed-outputs with-upload-monitoring) (define outputs - (derivation-outputs (read-derivation-from-file derivation))) + (derivation-outputs derivation)) (define output-details (map @@ -859,7 +859,8 @@ but the guix-daemon claims it's unavailable" ;; Retry submitting the log file (agent-submit-log-file lgr coordinator-interface - build-id derivation) + build-id + (derivation-file-name derivation)) (attempt-submit-build-result)) (else |