From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 0/5] fix deadlock in git-push
Date: Tue, 19 Apr 2016 18:39:46 -0400 [thread overview]
Message-ID: <20160419223945.GA18055@sigill.intra.peff.net> (raw)
I ran across a deadlock today while pushing from a corrupted repository
where pack-objects fails. Obviously I don't expect this to succeed, but
it should not hang indefinitely.
The first patch below fixes the deadlock. Unfortunately, it turns it
into a likely SIGPIPE death. Which is an improvement, but not ideal.
Patches 2 and 3 address that by fixing the way we handle SIGPIPE in
async threads.
Patches 4 and 5 are cleanups to earlier topics that are enabled by the
new SIGPIPE handling.
[1/5]: send-pack: close demux pipe before finishing async process
[2/5]: run-command: teach async threads to ignore SIGPIPE
[3/5]: send-pack: isolate sigpipe in demuxer thread
[4/5]: fetch-pack: isolate sigpipe in demuxer thread
[5/5]: t5504: drop sigpipe=ok from push tests
I confirmed that after this series we still pass the stress test I
outlined in
http://article.gmane.org/gmane.comp.version-control.git/287176
So hopefully I haven't made anything worse (and that the tightening in
5/5 isn't just bringing back some test flakiness).
-Peff
next reply other threads:[~2016-04-19 22:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-19 22:39 Jeff King [this message]
2016-04-19 22:45 ` [PATCH 1/5] send-pack: close demux pipe before finishing async process Jeff King
2016-04-19 22:49 ` [PATCH 2/5] run-command: teach async threads to ignore SIGPIPE Jeff King
2016-04-21 5:15 ` Johannes Sixt
2016-04-21 5:18 ` Jeff King
2016-04-19 22:50 ` [PATCH 3/5] send-pack: isolate sigpipe in demuxer thread Jeff King
2016-04-19 22:50 ` [PATCH 4/5] fetch-pack: " Jeff King
2016-04-19 22:51 ` [PATCH 5/5] t5504: drop sigpipe=ok from push tests Jeff King
2016-04-20 21:17 ` [PATCH 0/5] fix deadlock in git-push Junio C Hamano
2016-04-20 21:51 ` Jeff King
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=20160419223945.GA18055@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/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 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 NNTP newsgroup(s).