From: "Michal Suchánek" <firstname.lastname@example.org>
To: Eric Sunshine <email@example.com>
Cc: "Git List" <firstname.lastname@example.org>,
"Marketa Calabkova" <email@example.com>,
"Nguyễn Thái Ngọc Duy" <firstname.lastname@example.org>,
"Junio C Hamano" <email@example.com>
Subject: Re: [PATCH v3 2/2] setup: don't fail if commondir reference is deleted.
Date: Thu, 21 Feb 2019 12:19:50 +0100 [thread overview]
Message-ID: <firstname.lastname@example.org> (raw)
On Wed, 20 Feb 2019 13:35:57 -0500
Eric Sunshine <email@example.com> wrote:
> On Wed, Feb 20, 2019 at 12:16 PM Michal Suchánek <firstname.lastname@example.org> wrote:
> > On Wed, 20 Feb 2019 11:55:46 -0500
> > Eric Sunshine <email@example.com> wrote:
> > > Following this change, that particular validation no longer takes
> > > place. But, more importantly, what does it mean to fall back to
> > > "default" for this particular worktree? I'm having trouble
> > > understanding how the new behavior can be correct or desirable. (Am I
> > > missing something obvious?)
> > If the file can be missing altogether and it is not an error how it is
> > incorrect or undesirable to ignore zero size file?
> Because the _presence_ of that file indicates a linked worktree,
> whereas it's absence indicates the main worktree. If the file is
> present but empty, then that is an abnormal condition, i.e. some form
> of corruption.
> The difference is significant, and that's why I'm asking if the new
> behavior is correct or desirable. If you start interpreting this
> abnormal condition as a non-error, then get_common_dir_noenv() will be
> reporting that this is the main worktree when in fact it is (a somehow
> corrupted) linked worktree. Such false reporting could trigger
> undesirable and outright wrong behavior in callers.
This is not an issue introduced with this patch, however. The worktree
is not initialized atomically. First the worktree directory is created
and then it is populated with content including the commondir reference.
Because there is no big repository lock that everyone takes to access
a repository other running git processes can see the wotktree without
the commondir file.
The way this is mitigated in users of get_worktrees() is an assumption
that the first worktree is the main worktree.
If this is sufficient is not something this patchset aims to address.
It merely addresses get_worktrees() aborting due to hitting specific
stage in the initialization of a worktree.
prev parent reply other threads:[~2019-02-21 11:19 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-18 17:04 [PATCH 0/2] worktree add race fix Michal Suchanek
2019-02-18 17:04 ` [PATCH 1/2] worktree: fix worktree add race Michal Suchanek
2019-02-18 17:04 ` [PATCH 2/2] setup: don't fail if commondir reference is deleted Michal Suchanek
2019-02-18 21:00 ` Eric Sunshine
2019-02-21 10:50 ` Duy Nguyen
2019-02-21 13:50 ` Michal Suchánek
2019-02-21 17:07 ` Phillip Wood
2019-02-21 17:12 ` Eric Sunshine
2019-02-21 17:27 ` Phillip Wood
2019-03-04 13:30 ` Michal Suchánek
2019-02-21 17:33 ` Michal Suchánek
2019-02-22 9:32 ` Duy Nguyen
2019-02-22 10:20 ` Phillip Wood
2019-02-22 9:26 ` Duy Nguyen
2019-02-20 16:16 ` [PATCH v3 1/2] worktree: fix worktree add race Michal Suchanek
2019-02-20 16:34 ` Eric Sunshine
2019-02-20 17:29 ` Michal Suchánek
2019-03-08 9:20 ` Duy Nguyen
2019-03-08 9:37 ` Eric Sunshine
2019-03-11 1:55 ` Junio C Hamano
2019-02-20 16:16 ` [PATCH v3 2/2] setup: don't fail if commondir reference is deleted Michal Suchanek
2019-02-20 16:55 ` Eric Sunshine
2019-02-20 17:16 ` Michal Suchánek
2019-02-20 18:35 ` Eric Sunshine
2019-02-21 9:27 ` Eric Sunshine
2019-02-21 11:13 ` Michal Suchánek
2019-02-21 11:19 ` Michal Suchánek [this message]
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:
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
* 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
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).