From: "Ludovic Courtès" <ludo@gnu.org>
To: guix-devel@gnu.org, Mathieu Othacehe <othacehe@gnu.org>
Subject: Re: 05/07: inferior: Fix concurrent cached-profile calls.
Date: Wed, 10 Mar 2021 10:48:21 +0100 [thread overview]
Message-ID: <87blbr7316.fsf@gnu.org> (raw)
In-Reply-To: <20210310075020.CC605211CF@vcs0.savannah.gnu.org> (guix-commits@gnu.org's message of "Wed, 10 Mar 2021 02:50:20 -0500 (EST)")
Hi Mathieu,
guix-commits@gnu.org skribis:
> commit 6ee7e3d26b8f5d2a234518cc2ab1bfeba7cd7c18
> Author: Mathieu Othacehe <othacehe@gnu.org>
> AuthorDate: Fri Mar 5 12:49:06 2021 +0100
>
> inferior: Fix concurrent cached-profile calls.
>
> * guix/inferior.scm (cached-profile): Do not create the profile symlink if it
> already exists.
[...]
> +++ b/guix/inferior.scm
> @@ -755,8 +755,9 @@ seconds. This procedure opens a new connection to the build daemon."
> (built-derivations (list profile))
> ;; Note: Caching is fine even when AUTHENTICATE? is false because
> ;; we always call 'latest-channel-instances?'.
> - (symlink* (derivation->output-path profile) cached)
> - (add-indirect-root* cached)
> + (unless (file-exists? cached)
> + (symlink* (derivation->output-path profile) cached)
> + (add-indirect-root* cached))
> (return cached))))))
It should be ‘munless’ instead of ‘unless’ since we’re in an ‘mbegin’.
However, there’s already a (file-exists? cached) call a few lines
above. So what you need instead is a TOCTTOU-free ‘symlink’, along
these lines:
(define (symlink/safe old new)
(catch 'system-error
(lambda ()
(symlink old new))
(lambda args
(unless (= EEXIST (system-error-errno args))
(apply throw args)))))
;; …
(define symlink*
(lift2 symlink/safe %store-monad))
WDYT?
Ludo’.
next parent reply other threads:[~2021-03-10 9:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20210310075017.12619.72665@vcs0.savannah.gnu.org>
[not found] ` <20210310075020.CC605211CF@vcs0.savannah.gnu.org>
2021-03-10 9:48 ` Ludovic Courtès [this message]
2021-03-10 12:13 ` 05/07: inferior: Fix concurrent cached-profile calls Mathieu Othacehe
[not found] ` <20210310075020.83E6A211CF@vcs0.savannah.gnu.org>
2021-03-10 9:57 ` 04/07: inferior: Break cached-channel-instance into two procedures Ludovic Courtès
2021-03-10 12:14 ` Mathieu Othacehe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87blbr7316.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=guix-devel@gnu.org \
--cc=othacehe@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.