From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>,
git@vger.kernel.org, Erik Faye-Lund <kusmabite@gmail.com>,
Aman Gupta <aman@github.com>, Ryan Tomayko <ryan@github.com>
Subject: [1.7.2] Please cherry-pick "upload-pack: start pack-objects before async rev-list"
Date: Thu, 26 May 2011 01:45:48 -0500 [thread overview]
Message-ID: <20110526064547.GA18777@elie> (raw)
In-Reply-To: <20110406213333.GA18481@sigill.intra.peff.net>
Hi Junio,
Jeff King wrote:
> Subject: [PATCH] upload-pack: start pack-objects before async rev-list
>
> In a pthread-enabled version of upload-pack, there's a race condition
> that can cause a deadlock on the fflush(NULL) we call from run-command.
This server-side deadlock started being triggered by shallow clones
when sv.gnu.org upgraded to v1.7.2.5 a couple of months ago[1]. So it
might be worth thinking about how to help upgrade-averse server admins
to fix it.
Luckily, Jeff's patch (v1.7.5.1~4^2, upload-pack: start pack-objects
before async rev-list, 2011-04-06) applies cleanly on top of the
oldest commit with the problem that I can find (v1.7.2-rc0~31^2~3,
Reimplement async procedures using pthreads, 2010-03-06). Could you
queue it for inclusion in maint-1.7.2?
If I understand correctly, Windows with threaded async rev-list before
then would not have suffered from this deadlock because it did not
fflush(NULL) in start_command until v1.7.4.1~18 (start_command: flush
buffers in the WIN32 code path as well, 2011-02-04).
[1] http://thread.gmane.org/gmane.comp.version-control.git/172042
next prev parent reply other threads:[~2011-05-26 6:46 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-04 5:36 [RFC] upload-pack deadlock Jeff King
2011-04-06 17:20 ` Junio C Hamano
2011-04-06 17:54 ` Jeff King
2011-04-06 19:15 ` Erik Faye-Lund
2011-04-06 21:38 ` Jeff King
2011-04-06 21:33 ` Jeff King
2011-04-18 5:34 ` Jonathan Nieder
2011-05-26 6:45 ` Jonathan Nieder [this message]
2011-05-26 16:58 ` [1.7.2] Please cherry-pick "upload-pack: start pack-objects before async rev-list" Junio C Hamano
2011-05-26 17:11 ` Jonathan Nieder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110526064547.GA18777@elie \
--to=jrnieder@gmail.com \
--cc=aman@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kusmabite@gmail.com \
--cc=peff@peff.net \
--cc=ryan@github.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.