From: "Ludovic Courtès" <ludo@gnu.org>
To: Christopher Marusich <cmmarusich@gmail.com>
Cc: 41607@debbugs.gnu.org, Stephen Scheck <singularsyntax@gmail.com>
Subject: bug#41607: Deleted store items are not actually deleted
Date: Fri, 05 Jun 2020 18:21:56 +0200 [thread overview]
Message-ID: <877dwl32l7.fsf@gnu.org> (raw)
In-Reply-To: <87pnad6eor.fsf@gmail.com> (Christopher Marusich's message of "Fri, 05 Jun 2020 02:32:20 -0700")
Howdy!
Christopher Marusich <cmmarusich@gmail.com> skribis:
> Here is a patch. Turns out it's was just a one line change! If nobody
> has any further feedback on it, I'll go ahead and merge it to the master
> branch in the next couple days.
Yay!
> From 505481a6a22819a42320f693988c3f8e13ded080 Mon Sep 17 00:00:00 2001
> From: Chris Marusich <cmmarusich@gmail.com>
> Date: Thu, 4 Jun 2020 23:26:19 -0700
> Subject: [PATCH] daemon: Handle EXDEV when moving to trash directory.
>
> Fixes <https://bugs.gnu.org/41607>.
> Reported by Stephen Scheck <singularsyntax@gmail.com>.
>
> * nix/libstore/gc.cc (LocalStore::deletePathRecursive): When we try to
> move a dead directory into the trashDir using rename(2) but it returns
> an EXDEV error, just delete the directory instead. This can happen in a
> Docker container when the directory is not on the "top layer".
> ---
> nix/libstore/gc.cc | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc
> index 8bc4e01eb0..845fe278c7 100644
> --- a/nix/libstore/gc.cc
> +++ b/nix/libstore/gc.cc
> @@ -455,7 +455,10 @@ void LocalStore::deletePathRecursive(GCState & state, const Path & path)
> throw SysError(format("unable to rename `%1%' to `%2%'") % path % tmp);
> state.bytesInvalidated += size;
> } catch (SysError & e) {
> - if (e.errNo == ENOSPC) {
> + // In a Docker container, rename(2) returns EXDEV when the source
> + // and destination are not both on the "top layer". See:
> + // https://bugs.gnu.org/41607
> + if (e.errNo == ENOSPC || e.errNo == EXDEV) {
> printMsg(lvlInfo, format("note: can't create move `%1%': %2%") % path % e.msg());
> deleteGarbage(state, path);
> }
For consistency with (most) of the code, I’d suggest a /* */ comment.
Otherwise LGTM, thank you!
Ludo’.
next prev parent reply other threads:[~2020-06-05 16:23 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAKjnHz1X26QhPEWZfOmAbEmZHQA1qdU_Dq7U6kVXUqG7vCvuhw@mail.gmail.com>
[not found] ` <20200528181043.GC23745@jasmine.lan>
[not found] ` <CAKjnHz0txxc+Bdc5=4TLLcxSmRpf2sCJswu-E36UJKvQqBA2kQ@mail.gmail.com>
[not found] ` <20200529170820.GA30828@jasmine.lan>
[not found] ` <CAKjnHz1b1EUXszQtUVz9p8zWu+h0HtPfCzrOmrXO+eyhH+AvVw@mail.gmail.com>
[not found] ` <20200529180245.GA3754@jasmine.lan>
[not found] ` <CAKjnHz0Ce=w0DZPi6xE6GNQ4-ezmvjUr+5FqxsvCBdx4SU+VsQ@mail.gmail.com>
2020-05-29 19:09 ` bug#41607: Deleted store items are not actually deleted Leo Famulari
2020-05-31 4:56 ` Chris Marusich
2020-05-31 9:27 ` zimoun
2020-06-04 11:58 ` Ludovic Courtès
2020-06-04 18:50 ` Chris Marusich
2020-06-05 9:32 ` Christopher Marusich
2020-06-05 9:36 ` zimoun
2020-06-05 16:05 ` Stephen Scheck
2020-06-05 16:21 ` Ludovic Courtès [this message]
2020-06-07 1:31 ` Chris Marusich
2020-06-07 10:07 ` zimoun
2020-06-08 7:43 ` Chris Marusich
[not found] ` <CAJ3okZ0vPpPnDQavrpufPXmSZWk2h+oN2SR7CDVwaEhg-h4h6g@mail.gmail.com>
[not found] ` <CAKjnHz1kgwCOia5_hVYkuwaoOiJ55cATaF-Ed6_RsS-r5AELHw@mail.gmail.com>
[not found] ` <CAJ3okZ2MhALsxXvWGJccE8feERDf4SihtpF=68s-APQbqaUMRA@mail.gmail.com>
[not found] ` <CAKjnHz33fQrKa3KoQsDWh0pv-SgGZwPnn1Wgu6Kvf=SDGb2dWQ@mail.gmail.com>
[not found] ` <CAJ3okZ0C2_wECSG4jWq1+ZaO=vL5Zbvyo-2kStaK0cTyF3fXgA@mail.gmail.com>
[not found] ` <CAKjnHz35PVGM4BcJUML8=hLxXbJG-hcOg8PeZFjqCoTXe7EueQ@mail.gmail.com>
2020-05-29 23:36 ` zimoun
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877dwl32l7.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=41607@debbugs.gnu.org \
--cc=cmmarusich@gmail.com \
--cc=singularsyntax@gmail.com \
/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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).