From: Jeff King <peff@peff.net>
To: Mike Hommey <mh@glandium.org>
Cc: "Johannes Sixt" <j6t@kdbg.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
git@vger.kernel.org
Subject: Re: Closing fds twice when using remote helpers
Date: Wed, 15 May 2019 23:28:02 -0400 [thread overview]
Message-ID: <20190516032802.GB4596@sigill.intra.peff.net> (raw)
In-Reply-To: <20190516004802.fmtdz52xxcplkgcf@glandium.org>
On Thu, May 16, 2019 at 09:48:02AM +0900, Mike Hommey wrote:
> > diff --git a/transport-helper.c b/transport-helper.c
> > index fcd2a58d0e..45cdf891ec 100644
> > --- a/transport-helper.c
> > +++ b/transport-helper.c
> > @@ -433,7 +433,7 @@ static int get_importer(struct transport *transport, struct child_process *fasti
> > struct helper_data *data = transport->data;
> > int cat_blob_fd, code;
> > child_process_init(fastimport);
> > - fastimport->in = helper->out;
> > + fastimport->in = xdup(helper->out);
> > argv_array_push(&fastimport->args, "fast-import");
> > argv_array_push(&fastimport->args, debug ? "--stats" : "--quiet");
> >
> >
> > One thing I'd wonder, though: what is the contract between the helper
> > and fast-import here? In the current code, when the helper closes its
> > stdout, fast-import will see EOF. But not if we are holding on to
> > another copy of the descriptor.
>
> The helper is supposed to finish the fast-import stream with "done".
> The documentation doesn't say much, but it also seems like the helper
> could theoretically continue to respond to commands it's sent after
> having done so, but that currently never happens AFAICT.
Hmm. We do not even pass --done to fast-import. If we are really
expecting everybody to say "done", then it seems like we ought to be
doing so. I think that "done" came much later than the concept of
fast-import, so while most reasonable importers would send it, I suspect
antique ones would not.
So I was all ready to say that we need to do it the other way (pass off
ownership) in order for fast-import to exit when the helper closes the
descriptor. But actually, I think I am being silly. The duplicated
descriptor is the _output_ from the helper, not the _input_ to
fast-import. So if we are also holding that output descriptor,
fast-import will not care. It is only the helper which would then not
notice fast-import dying (and continue writing to the descriptor
without EPIPE, since we are still on the other end of it).
I think that's probably OK, as we would see fast-import exit and then
continue ourselves. We'd probably die() immediately assuming fast-import
exits with an error. But if we don't, want happens? The helper would
eventually block if it fills the pipe buffer. We'd eventually end up in
disconnect_helper(). I think it would work out because we
close(data->helper->out) before trying to reap the child, so it would
get SIGPIPE then and exit.
So I think that works. But I have to admit that handing off ownership
seems simpler to reason about. :)
Totally orthogonal, but I think we might also want to introduce a helper
capability so that import helpers can say "I always send 'done' to
fast-import". And then we can pass "--done" to fast-import, which means
it would detect a truncated stream.
-Peff
next prev parent reply other threads:[~2019-05-16 3:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-15 10:56 Closing fds twice when using remote helpers Mike Hommey
2019-05-15 11:43 ` Ævar Arnfjörð Bjarmason
2019-05-15 17:59 ` Johannes Sixt
2019-05-15 22:08 ` Mike Hommey
2019-05-15 23:53 ` Jeff King
2019-05-16 0:48 ` Mike Hommey
2019-05-16 3:28 ` Jeff King [this message]
2019-05-16 8:35 ` Mike Hommey
2019-05-16 21:47 ` Jeff King
2019-05-16 22:02 ` Mike Hommey
2019-05-16 0:31 ` Mike Hommey
2019-05-16 0:37 ` [PATCH 1/2] dup() the input fd for fast-import used for " Mike Hommey
2019-05-16 0:37 ` [PATCH 2/2] Use xmmap_gently instead of xmmap in use_pack Mike Hommey
2019-05-16 3:34 ` Jeff King
2019-05-16 3:28 ` [PATCH 1/2] dup() the input fd for fast-import used for remote helpers 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
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=20190516032802.GB4596@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=mh@glandium.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.
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).