[PATCH 4/4] send-pack: abort sideband demuxer on pack-objects error
- From
Jeff King <peff@peff.net>
- Date
- Mar 31, 2011, 18:44 UTC
- Message-ID
- <20110331184443.GD16906@sigill.intra.peff.net>
- In-Reply-To
- <20110331184243.GA12027@sigill.intra.peff.net>
If pack-objects dies prematurely (for example, because there is some repo corruption), we are careful to clean up the sideband demuxer (if it is being used) with finish_async. However, for an async implementation which forks (i.e., not Windows), that means we will waitpid() for the async process.
Meanwhile, the async sideband demuxer will continue trying to stream data from the remote repo until it gets EOF. Depending on what data pack-objects actually sent, the remote repo may not actually send anything (e.g., if we sent nothing and it is simply waiting for the pack). This leads to deadlock cycle in which send-pack waits on the demuxer, the demuxer waits on the remote receive-pack, and the remote receive-pack waits on send-pack to send the pack data.
To break this, let's have send-pack abort the demuxer when it knows that it has failed to properly send the pack.
Signed-off-by: Jeff King <peff@peff.net> --- builtin-send-pack.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/builtin-send-pack.c b/builtin-send-pack.c index 2478e18..cc068ff 100644 --- a/builtin-send-pack.c +++ b/builtin-send-pack.c @@ -516,7 +516,7 @@ int send_pack(struct send_pack_args *args, for (ref = remote_refs; ref; ref = ref->next) ref->status = REF_STATUS_NONE; if (use_sideband) - finish_async(&demux); + abort_async(&demux); return -1; } }
-- 1.7.4.13.g8566c