git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jeff King <peff@peff.net>
To: lars.schneider@autodesk.com
Cc: git@vger.kernel.org, t.gummerer@gmail.com, jrnieder@gmail.com,
	gitster@pobox.com, Lars Schneider <larsxschneider@gmail.com>
Subject: Re: [PATCH v1 2/2] entry.c: check if file exists after checkout
Date: Thu, 5 Oct 2017 07:23:55 -0400	[thread overview]
Message-ID: <20171005112355.lsoqxybgsovpqriy@sigill.intra.peff.net> (raw)
In-Reply-To: <20171005104407.65948-3-lars.schneider@autodesk.com>

On Thu, Oct 05, 2017 at 12:44:07PM +0200, lars.schneider@autodesk.com wrote:

> From: Lars Schneider <larsxschneider@gmail.com>
> 
> If we are checking out a file and somebody else racily deletes our file,
> then we would write garbage to the cache entry. Fix that by checking
> the result of the lstat() call on that file. Print an error to the user
> if the file does not exist.

My gut tells me this is the right thing to be doing, but this commit
message gives very little analysis. Let's see if we can talk it out a
bit.

Aside from bizarre lstat failures, the plausible reason for seeing this
is that somebody racily deleted the file. I.e.,:

  1. We wrote the file.

  2. They deleted it.

  3. We ran lstat() on it and found that it went away.

But imagine that the race went the other way, and (3) happened before
(2). Then we'd actually get a real index entry, but the file would
appear deleted to anybody who checks the filesystem against the stat
data.

So I guess my question is: is step 3 an integral part of the checkout
procedure, or is it simply an opportunity to refresh the index (since we
know we just wrote out the content)?

If it's an integral part, then I agree that the error return you add
here is the right thing to do. But if it's just an index refresh, then I
wonder if we should report a successful checkout, but mark the entry as
stat-dirty.

I dunno. It's pretty philosophical, and I have a feeling that nobody
really cares all that much in practice. Certainly the error return seems
like the easiest fix.

> diff --git a/entry.c b/entry.c
> index 5dab656364..2252d96756 100644
> --- a/entry.c
> +++ b/entry.c
> @@ -355,7 +355,8 @@ static int write_entry(struct cache_entry *ce,
>  	if (state->refresh_cache) {
>  		assert(state->istate);
>  		if (!fstat_done)
> -			lstat(ce->name, &st);
> +			if (lstat(ce->name, &st) < 0)
> +				return error("unable to get status of file %s", ce->name);

We could probably be a bit more specific about the situation, since the
user will see this message with no context. Maybe something like:

  unable to stat just-written file %s

or something. We should probably also use error_errno(). I'd bet if this
ever triggers that it's likely to be ENOENT, but certainly if it _isn't_
that would be interesting information.

-Peff

  reply	other threads:[~2017-10-05 11:24 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-05 10:44 [PATCH v1 0/2] fix temporary garbage in the cache entry lars.schneider
2017-10-05 10:44 ` [PATCH v1 1/2] entry.c: update cache entry only for existing files lars.schneider
2017-10-05 11:12   ` Jeff King
2017-10-05 11:19   ` Junio C Hamano
2017-10-05 11:26     ` Jeff King
2017-10-05 23:01       ` Junio C Hamano
2017-10-06  4:54         ` Jeff King
2017-10-08 21:37           ` Lars Schneider
2017-10-09 17:47             ` Jeff King
2017-10-09 17:48               ` [PATCH 1/3] write_entry: fix leak when retrying delayed filter Jeff King
2017-10-10  0:00                 ` Junio C Hamano
2017-10-10  9:23                   ` Simon Ruderich
2017-10-10  9:25                     ` Jeff King
2017-10-10  9:49                       ` Simon Ruderich
2017-10-09 17:48               ` [PATCH 2/3] write_entry: avoid reading blobs in CE_RETRY case Jeff King
2017-10-10  0:00                 ` Junio C Hamano
2017-10-09 17:50               ` [PATCH 3/3] write_entry: untangle symlink and regular-file cases Jeff King
2017-10-10  0:03                 ` Junio C Hamano
2017-10-05 10:44 ` [PATCH v1 2/2] entry.c: check if file exists after checkout lars.schneider
2017-10-05 11:23   ` Jeff King [this message]
2017-10-06  4:26     ` Junio C Hamano
2017-10-06  4:56       ` Jeff King
2017-10-06  6:03         ` Junio C Hamano
2017-10-06  6:05           ` Jeff King
2017-10-06  7:58             ` Junio C Hamano
2017-10-08 21:41         ` Lars Schneider

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: 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 \
    --in-reply-to=20171005112355.lsoqxybgsovpqriy@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=lars.schneider@autodesk.com \
    --cc=larsxschneider@gmail.com \
    --cc=t.gummerer@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://80x24.org/mirrors/git.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).