From: "Ludovic Courtès" <ludo@gnu.org>
To: Caleb Ristvedt <caleb.ristvedt@cune.org>
Cc: 41119@debbugs.gnu.org
Subject: [bug#41119] [PATCH] fix some issues with (guix nar)
Date: Thu, 07 May 2020 10:05:08 +0200 [thread overview]
Message-ID: <87o8r0dvbf.fsf@gnu.org> (raw)
In-Reply-To: <87h7wsqu50.fsf@cune.org> (Caleb Ristvedt's message of "Wed, 06 May 2020 22:52:11 -0500")
Hi!
Caleb Ristvedt <caleb.ristvedt@cune.org> skribis:
> From b2c66b443bd42e05820cfb3920c96f1894820587 Mon Sep 17 00:00:00 2001
> From: Caleb Ristvedt <caleb.ristvedt@cune.org>
> Date: Wed, 6 May 2020 11:48:21 -0500
> Subject: [PATCH 1/2] nar: 'finalize-store-file' follows proper store lock
> protocol.
>
> * guix/nar.scm (finalize-store-file): check for deletion token when acquiring
> lock, write deletion token and delete lock file before releasing lock.
[...]
> + ;; TODO: make this reusable
> + (define (acquire-lock filename)
For consistency, s/filename/file/ please. :-)
> + (let ((port (lock-file filename)))
> + (if (zero? (stat:size (stat port)))
> + port
> + (begin
Could you add a comment, like: “If FILE is non-empty, that’s because it
contains the deletion token, so try again.”
> (when lock?
> + (delete-file (string-append target ".lock"))
> + (display "d" lock)
> + (force-output lock)
Also a comment explaining why we’re writing a deletion token.
It’s a fine point of the daemon that I had totally overlooked. I wonder
what the implications might have been.
> From 43ee61b405b01038b3e7c84aba64521ab8a62236 Mon Sep 17 00:00:00 2001
> From: Caleb Ristvedt <caleb.ristvedt@cune.org>
> Date: Wed, 6 May 2020 11:52:16 -0500
> Subject: [PATCH 2/2] nar: 'with-temporary-store-file' uses a single connection
>
> Previously the 'with-store' form was entered every time a different temporary
> file was tried. This caused there to be as many simultaneous open connections
> as there were attempts, and prevented the (loop ...) call from being a tail
> call. This change fixes that.
>
> * guix/nar.scm (with-temporary-store-file): open connection once prior to
> entering the loop.
LGTM!
You can push both patches to ‘master’ (make sure “make authenticate”
passes before you do).
Thanks a lot for the quick fixes!
Ludo’.
next prev parent reply other threads:[~2020-05-07 8:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 3:52 [bug#41119] [PATCH] fix some issues with (guix nar) Caleb Ristvedt
2020-05-07 8:05 ` Ludovic Courtès [this message]
2020-05-11 21:39 ` bug#41119: " Ludovic Courtès
2020-05-27 21:54 ` [bug#41119] " Ludovic Courtès
2020-05-28 8:50 ` Caleb Ristvedt
2020-05-28 10:32 ` Ludovic Courtès
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=87o8r0dvbf.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=41119@debbugs.gnu.org \
--cc=caleb.ristvedt@cune.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.