Re: Bug report: orphaned pack-objects after killing upload-pack on [was: (no subject)]
- From
Jeff King <peff@peff.net>
- Date
- Nov 21, 2020, 00:29 UTC
- Message-ID
- <20201121002921.GC353076@coredump.intra.peff.net>
- In-Reply-To
- <badf3777-3970-b714-3ad9-67d2f77f94a5@web.de>
On Fri, Nov 20, 2020 at 07:52:45PM +0100, René Scharfe wrote:
Show 22 quoted lines
> Have you seen this working as you expect in an earlier version? > > I suspect it's a matter of turning on some flags (patch below), but I > have to admit I don't really know what I'm doing here -- and why this > hasn't been done already. > > René > > --- > upload-pack.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/upload-pack.c b/upload-pack.c > index 5dc8e1f844..e42dea26fa 100644 > --- a/upload-pack.c > +++ b/upload-pack.c > @@ -321,6 +321,8 @@ static void create_pack_file(struct upload_pack_data *pack_data, > pack_objects.in = -1; > pack_objects.out = -1; > pack_objects.err = -1; > + pack_objects.clean_on_exit = 1; > + pack_objects.wait_after_clean = 1;
Yeah, clean_on_exit seems quite reasonable to me. I suspect nobody ever really noticed, because as soon as pack-objects starts to write out the pack, it will get SIGPIPE or EPIPE and die. But there is no point in letting it chug on expensive object enumeration or delta compression if upload-pack has already exited.
I don't know that wait_after_clean is necessary. We don't need to wait for pack-objects to fail.
On the flip side, one of the reasons I added clean_on_exit long ago was for the similar issue on the push side, which is even worse. Here we might just waste some CPU, but on the push side we connect pack-objects directly to the remote socket, so it could actually complete the push (from the server's perspective) after the local git-push has died. Or at least I think that was possible at one point; it might not be the case any more.
I wrote this patch ages ago, and it is still sitting close to the bottom (if not the bottom) of my todo stack, waiting to be investigated. ;)
-- >8 -- Subject: [PATCH] send-pack: kill pack-objects helper on signal or exit
We spawn an external pack-objects process to actually send objects to the remote side. If we are killed by a signal during this process, the pack-objects will keep running and complete the push, which may surprise the user. We should take it down when we go down.
Signed-off-by: Jeff King <peff@peff.net> --- send-pack.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/send-pack.c b/send-pack.c index eb4a44270b..d2701bf35c 100644 --- a/send-pack.c +++ b/send-pack.c @@ -85,6 +85,7 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc po.in = -1; po.out = args->stateless_rpc ? -1 : fd; po.git_cmd = 1; + po.clean_on_exit = 1; if (start_command(&po)) die_errno("git pack-objects failed");
-- 2.29.2.730.g3e418f96ba