cbaines/guix-data-service
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move the inferior cleanup to the end of each system+target

Browse source
This commit is contained in:
Christopher Baines 2024-11-03 21:24:30 +00:00
parent cee8868bfd
commit d310632f26
1 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
guix-data-service/jobs/load-new-guix-revision.scm
View file

@ -620,19 +620,6 @@
'(define unsupported-cross-compilation-target-error? (const #f))
inf))
(catch
'match-error
(lambda ()
(inferior-eval '(invalidate-derivation-caches!) inf))
(lambda (key . args)
(simple-format
(current-error-port)
"warning: ignoring match-error from calling inferior invalidate-derivation-caches!\n")))
;; Clean the cached store connections, as there are caches associated
;; with these that take up lots of memory
(inferior-eval '(when (defined? '%store-table) (hash-clear! %store-table)) inf)
(inferior-eval-with-store/non-blocking
inf
store
@ -1939,6 +1926,25 @@ SELECT 1 FROM derivation_source_file_nars WHERE derivation_source_file_id = $1"
(define chunk-size 1000)
(define (inferior-cleanup inferior)
(catch
'match-error
(lambda ()
(inferior-eval '(invalidate-derivation-caches!)
inferior))
(lambda (key . args)
(simple-format
(current-error-port)
"warning: ignoring match-error from calling inferior invalidate-derivation-caches!\n")))
;; Clean the cached store connections, as there are
;; caches associated with these that take up lots of
;; memory
(inferior-eval
'(when (defined? '%store-table)
(hash-clear! %store-table))
inferior))
(define (get-derivations system target)
(let ((derivations-vector (make-vector packages-count)))
(with-time-logging
@ -1955,13 +1961,19 @@ SELECT 1 FROM derivation_source_file_nars WHERE derivation_source_file_id = $1"
(lambda (inferior inferior-store)
(ensure-gds-inferior-packages-defined! inferior)
(let ((result
(inferior-package-derivations
inferior-store
inferior
system
target
start-index
count)))))
count)))
(when last-chunk?
(inferior-cleanup inferior))
result)))))
(vector-copy! derivations-vector
start-index
chunk)