From: Thomas Braun <thomas.braun@virtuell-zuhause.de>
To: Derrick Stolee <stolee@gmail.com>, Jeff King <peff@peff.net>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: Parallel fetch and commit graph writing results in locking failure (even on linux)
Date: Sun, 15 Dec 2019 18:19:05 +0100 (CET) [thread overview]
Message-ID: <264571040.270538.1576430345179@ox.hosteurope.de> (raw)
In-Reply-To: <b7d5a758-9753-bb8b-f66e-6435fb19046b@gmail.com>
> Derrick Stolee <stolee@gmail.com> hat am 13. Dezember 2019 um 20:58 geschrieben:
>
>
> On 12/13/2019 2:52 PM, Jeff King wrote:
> > On Fri, Dec 13, 2019 at 02:35:47PM -0500, Derrick Stolee wrote:
> >
> >> I don't think so. I think you just found a bug where the
> >> fetch.writeCommitGraph logic doesn't work with parallel fetch
> >> jobs (only one can write at a time).
> >>
> >> I believe the fix would be to write the commit-graph after
> >> all of the jobs have completed, which should mean we need to
> >> move the call to write_commit_graph_reachable() somewhere else
> >> inside builtin/fetch.c.
> >
> > This should be fixed in master by bcb06e204c (Merge branch
> > 'js/fetch-multi-lockfix', 2019-12-01), I think.
>
> Thanks, Peff. That exactly looks like the right fix. The
> actual commit is 7d8e72b9 ("fetch: avoid locking issues between
> fetch.jobs/fetch.writeCommitGraph" 2019-11-03). I had forgotten
> that this was already fixed.
Thanks Stolee and Peff, I'll update to a version with that fix. And in the unlikely case this does not resolve my issue, report back.
> Here is the diff, for reference:
>
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index 8d27f8abb7..20bcda09c4 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -1602,7 +1602,8 @@ static int fetch_multiple(struct string_list *list, int max_children)
> return errcode;
> }
>
> - argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", NULL);
> + argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc",
> + "--no-write-commit-graph", NULL);
> add_options_to_argv(&argv);
>
> if (max_children != 1 && list->nr != 1) {
>
> -Stolee
>
next prev parent reply other threads:[~2019-12-15 17:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 19:20 Parallel fetch and commit graph writing results in locking failure (even on linux) Thomas Braun
2019-12-13 19:35 ` Derrick Stolee
2019-12-13 19:52 ` Jeff King
2019-12-13 19:58 ` Derrick Stolee
2019-12-15 17:19 ` Thomas Braun [this message]
2019-12-13 20:15 ` SZEDER Gábor
2019-12-15 17:35 ` german language fix: Generierung vs. Generation [was: Re: Parallel fetch and commit graph writing results in locking failure (even on linux)] Thomas Braun
2019-12-15 19:44 ` [PATCH] l10n: de.po: Reword generation numbers Ralf Thielow
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=264571040.270538.1576430345179@ox.hosteurope.de \
--to=thomas.braun@virtuell-zuhause.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=stolee@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).