From: Jonathan Tan <jonathantanmy@google.com>
To: Jeff King <peff@peff.net>
Cc: Jonathan Tan <jonathantanmy@google.com>,
git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH v2 0/4] Don't lazy-fetch commits when parsing them
Date: Thu, 1 Dec 2022 13:26:50 -0800 [thread overview]
Message-ID: <20221201212650.414069-1-jonathantanmy@google.com> (raw)
In-Reply-To: <Y4kGiEXdTOpn5Eyi@coredump.intra.peff.net>
Jeff King <peff@peff.net> writes:
> On Thu, Dec 01, 2022 at 11:27:29AM -0800, Jonathan Tan wrote:
>
> > Thanks everyone for your reviews. Here is a reroll with the requested change
> > (just one small one).
>
> Thanks, this looks OK to me. However Junio noted in "What's cooking"
> that it seems to break CI on windows. The problem is in t5318.93:
>
> 2022-12-01T09:26:44.8887018Z ++ cat test_err
> 2022-12-01T09:26:44.8887414Z error: Could not read 0000000000000000000000000000000000000000
> 2022-12-01T09:26:44.8887825Z error: Could not read 0000000000000000000000000000000000000000
> 2022-12-01T09:26:44.8888240Z error: Could not read 0000000000000000000000000000000000000000
> 2022-12-01T09:26:44.8888639Z error: Could not read 0000000000000000000000000000000000000000
> 2022-12-01T09:26:44.8889052Z error: Could not read 0000000000000000000000000000000000000000
> 2022-12-01T09:26:44.8889512Z error: Could not read 0000000000000000000000000000000000000000
> 2022-12-01T09:26:44.8889991Z fatal: failed to read object 0000000000000000000000000000000000000000: Function not implemented
> 2022-12-01T09:26:44.8890401Z ++ return 1
> 2022-12-01T09:26:44.8890761Z error: last command exited with $?=1
> 2022-12-01T09:26:44.8891263Z not ok 93 - corrupt commit-graph write (broken parent)
>
> Looks like the check in die_if_corrupt() is seeing a different errno
> value than ENOENT. I wonder if we need to take more care to preserve it
> across calls. It does look like we hit the same sequence of functions
> that read_object_file_extended() did, but perhaps this was buggy all
> along, and you're now exposing it through a new code path.
>
> In particular I wonder if obj_read_unlock() might be the culprit here,
> and something like this might help:
>
> diff --git a/object-file.c b/object-file.c
> index 8adef99a7c..db2d35519e 100644
> --- a/object-file.c
> +++ b/object-file.c
> @@ -1641,9 +1641,12 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
> struct object_info *oi, unsigned flags)
> {
> int ret;
> + int save_errno;
> obj_read_lock();
> ret = do_oid_object_info_extended(r, oid, oi, flags);
> + save_errno = errno;
> obj_read_unlock();
> + errno = save_errno;
> return ret;
> }
Copying die_if_corrupt() until "failed to read object":
> 1734 void die_if_corrupt(struct repository *r,
> 1735 const struct object_id *oid,
> 1736 const struct object_id *real_oid)
> 1737 {
> 1738 const struct packed_git *p;
> 1739 const char *path;
> 1740 struct stat st;
> 1741
> 1742 obj_read_lock();
> 1743 if (errno && errno != ENOENT)
> 1744 die_errno(_("failed to read object %s"), oid_to_hex(oid));
I wonder if we could just remove this check. Even as it is, I don't think that
there is any guarantee that obj_read_lock() would not clobber errno. Removing
it makes all tests pass locally, but I haven't tried it on CI.
(One argument that could be made is that we shouldn't have any die_if_corrupt()
refactoring or other refactoring of the sort, because previously its contents
was part of a function and it could thus rely on the errno of what has happened
previously. But I think that even without my patches, we couldn't rely on it
in the first place - looking at obj_read_lock(), it looks like it could init a
mutex, and depending on the implementation of that, it could clobber errno.)
next prev parent reply other threads:[~2022-12-01 21:27 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 20:30 [PATCH 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-11-30 20:30 ` [PATCH 1/4] object-file: reread object with exact same args Jonathan Tan
2022-11-30 20:30 ` [PATCH 2/4] object-file: refactor corrupt object diagnosis Jonathan Tan
2022-11-30 20:47 ` Jeff King
2022-11-30 23:42 ` Junio C Hamano
2022-12-01 19:06 ` Jonathan Tan
2022-11-30 20:30 ` [PATCH 3/4] object-file: refactor replace object lookup Jonathan Tan
2022-11-30 20:54 ` Jeff King
2022-11-30 20:30 ` [PATCH 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-11-30 21:04 ` Jeff King
2022-12-01 19:11 ` Jonathan Tan
2022-12-01 19:33 ` Jeff King
2022-11-30 23:56 ` Junio C Hamano
2022-11-30 21:06 ` [PATCH 0/4] Don't lazy-fetch commits when parsing them Jeff King
2022-12-01 19:27 ` [PATCH v2 " Jonathan Tan
2022-12-01 19:27 ` [PATCH v2 1/4] object-file: reread object with exact same args Jonathan Tan
2022-12-01 19:27 ` [PATCH v2 2/4] object-file: refactor corrupt object diagnosis Jonathan Tan
2022-12-01 19:27 ` [PATCH v2 3/4] object-file: refactor replace object lookup Jonathan Tan
2022-12-01 19:27 ` [PATCH v2 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-01 19:54 ` [PATCH v2 0/4] Don't lazy-fetch commits when parsing them Jeff King
2022-12-01 21:26 ` Jonathan Tan [this message]
2022-12-02 0:23 ` Jeff King
2022-12-06 0:49 ` Jonathan Tan
2022-12-06 2:03 ` Jeff King
2022-12-01 23:09 ` Junio C Hamano
2022-12-07 0:40 ` [PATCH v2 0/3] " Jonathan Tan
2022-12-07 0:40 ` [PATCH v2 1/3] object-file: don't exit early if skipping loose Jonathan Tan
2022-12-07 1:12 ` Junio C Hamano
2022-12-07 6:14 ` Jeff King
2022-12-07 6:43 ` Junio C Hamano
2022-12-07 23:20 ` Jonathan Tan
2022-12-07 0:40 ` [PATCH v2 2/3] object-file: emit corruption errors when detected Jonathan Tan
2022-12-07 1:16 ` Junio C Hamano
2022-12-07 4:05 ` Ævar Arnfjörð Bjarmason
2022-12-07 7:07 ` Jeff King
2022-12-07 10:33 ` Ævar Arnfjörð Bjarmason
2022-12-07 23:26 ` Jonathan Tan
2022-12-07 23:50 ` Ævar Arnfjörð Bjarmason
2022-12-08 6:33 ` Jeff King
2022-12-07 6:42 ` Jeff King
2022-12-07 0:40 ` [PATCH v2 3/3] commit: don't lazy-fetch commits Jonathan Tan
2022-12-07 1:17 ` Junio C Hamano
2022-12-07 6:47 ` Jeff King
2022-12-08 20:57 ` [PATCH v3 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-12-08 20:57 ` [PATCH v3 1/4] object-file: remove OBJECT_INFO_IGNORE_LOOSE Jonathan Tan
2022-12-08 20:57 ` [PATCH v3 2/4] object-file: refactor map_loose_object_1() Jonathan Tan
2022-12-09 2:00 ` Jeff King
2022-12-09 18:17 ` Jonathan Tan
2022-12-09 20:27 ` Jeff King
2022-12-09 20:27 ` Jeff King
2022-12-08 20:57 ` [PATCH v3 3/4] object-file: emit corruption errors when detected Jonathan Tan
2022-12-09 1:56 ` Jeff King
2022-12-09 18:26 ` Jonathan Tan
2022-12-09 14:19 ` Ævar Arnfjörð Bjarmason
2022-12-09 18:33 ` Jonathan Tan
2022-12-08 20:57 ` [PATCH v3 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-09 14:14 ` Ævar Arnfjörð Bjarmason
2022-12-09 21:44 ` [PATCH v4 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-12-09 21:44 ` [PATCH v4 1/4] object-file: remove OBJECT_INFO_IGNORE_LOOSE Jonathan Tan
2022-12-09 21:44 ` [PATCH v4 2/4] object-file: refactor map_loose_object_1() Jonathan Tan
2022-12-09 21:44 ` [PATCH v4 3/4] object-file: emit corruption errors when detected Jonathan Tan
2022-12-10 0:16 ` Junio C Hamano
2022-12-12 20:38 ` Jonathan Tan
2022-12-12 20:49 ` Jeff King
2022-12-12 20:59 ` Jonathan Tan
2022-12-12 21:20 ` Jeff King
2022-12-12 21:29 ` Jonathan Tan
2022-12-12 22:17 ` Jeff King
2022-12-12 22:52 ` Jonathan Tan
2022-12-13 10:37 ` Jeff King
2022-12-09 21:44 ` [PATCH v4 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-12 22:48 ` [PATCH v5 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-12-12 22:48 ` [PATCH v5 1/4] object-file: remove OBJECT_INFO_IGNORE_LOOSE Jonathan Tan
2022-12-12 22:48 ` [PATCH v5 2/4] object-file: refactor map_loose_object_1() Jonathan Tan
2022-12-12 22:48 ` [PATCH v5 3/4] object-file: emit corruption errors when detected Jonathan Tan
2022-12-13 1:51 ` Junio C Hamano
2022-12-13 10:38 ` Jeff King
2022-12-12 22:48 ` [PATCH v5 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 0/4] Don't lazy-fetch commits when parsing them Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 1/4] object-file: remove OBJECT_INFO_IGNORE_LOOSE Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 2/4] object-file: refactor map_loose_object_1() Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 3/4] object-file: emit corruption errors when detected Jonathan Tan
2022-12-14 19:17 ` [PATCH v6 4/4] commit: don't lazy-fetch commits Jonathan Tan
2022-12-14 20:43 ` [PATCH v6 0/4] Don't lazy-fetch commits when parsing them Jeff King
2022-12-15 0:07 ` Junio C Hamano
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=20221201212650.414069-1-jonathantanmy@google.com \
--to=jonathantanmy@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).