nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nar: Really lock store files. 

Previously, 'lock-store-file' would immediately close the file
descriptor of the '.lock' file, and thus it would immediately release
the lock.

* guix/nar.scm (lock-store-file, unlock-store-file): Remove.
(finalize-store-file): Use 'lock-file' and 'unlock-file' instead.
This commit is contained in:
Ludovic Courtès 2019-06-03 17:18:41 +02:00
parent d497b6ab39
commit 70a7a1b5dc
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
guix/nar.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -76,16 +76,6 @@
;; most of the daemon is in Scheme :-)). But note that we do use a couple of ;; most of the daemon is in Scheme :-)). But note that we do use a couple of
;; RPCs for functionality not available otherwise, like 'valid-path?'. ;; RPCs for functionality not available otherwise, like 'valid-path?'.
(define (lock-store-file file)
"Acquire exclusive access to FILE, a store file."
(call-with-output-file (string-append file ".lock")
(cut fcntl-flock <> 'write-lock)))
(define (unlock-store-file file)
"Release access to FILE."
(call-with-input-file (string-append file ".lock")
(cut fcntl-flock <> 'unlock)))
(define* (finalize-store-file source target (define* (finalize-store-file source target
#:key (references '()) deriver (lock? #t)) #:key (references '()) deriver (lock? #t))
"Rename SOURCE to TARGET and register TARGET as a valid store item, with "Rename SOURCE to TARGET and register TARGET as a valid store item, with
@ -94,25 +84,25 @@ before attempting to register it; otherwise, assume TARGET's locks are already
held." held."
(with-database %default-database-file db (with-database %default-database-file db
(unless (path-id db target) (unless (path-id db target)
(when lock? (let ((lock (and lock?
(lock-store-file target)) (lock-file (string-append target ".lock")))))
(unless (path-id db target) (unless (path-id db target)
;; If FILE already exists, delete it (it's invalid anyway.) ;; If FILE already exists, delete it (it's invalid anyway.)
(when (file-exists? target) (when (file-exists? target)
(delete-file-recursively target)) (delete-file-recursively target))
;; Install the new TARGET. ;; Install the new TARGET.
(rename-file source target) (rename-file source target)
;; Register TARGET. As a side effect, it resets the timestamps of all ;; Register TARGET. As a side effect, it resets the timestamps of all
;; its files, recursively, and runs a deduplication pass. ;; its files, recursively, and runs a deduplication pass.
(register-path target (register-path target
#:references references #:references references
#:deriver deriver)) #:deriver deriver))
(when lock? (when lock?
(unlock-store-file target))))) (unlock-file lock))))))
(define (temporary-store-file) (define (temporary-store-file)
"Return the file name of a temporary file created in the store." "Return the file name of a temporary file created in the store."