All of lore.kernel.org
 help / color / mirror / Atom feed
From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] t9300-fast-import: don't hang if background fast-import exits too early
Date: Sun, 1 Dec 2019 10:31:48 +0100	[thread overview]
Message-ID: <20191201093148.GH23183@szeder.dev> (raw)
In-Reply-To: <xmqqsgm512vl.fsf@gitster-ct.c.googlers.com>

On Sat, Nov 30, 2019 at 01:16:30PM -0800, Junio C Hamano wrote:
> SZEDER Gábor <szeder.dev@gmail.com> writes:
> 
> > +	(
> > +		git fast-import $options <&8 >&9 &
> > +		echo $! >V.fi.pid
> > +		wait $!
> > +		echo >&2 "background fast-import terminated too early with exit code $?"
> > +		# Un-block the read loop in the main shell process.
> > +		echo >&9 UNEXPECTED
> > +	) &
> > +	echo $! >V.sh.pid
> >  	# We don't mind if fast-import has already died by the time the test
> >  	# ends.
> > -	test_when_finished "
> > +	test_when_finished '
> >  		exec 8>&-; exec 9>&-;
> > -		kill $(cat V.pid) && wait $(cat V.pid)
> > -		true"
> > +		kill $(cat V.sh.pid) && wait $(cat V.sh.pid)
> > +		kill $(cat V.fi.pid) && wait $(cat V.sh.pid)
> > +		true'
> 
> The original interpolates the PID of the fast-import when
> "when-finished" program is registered, so it is OK if somebody else
> removed V.pid file; the new one interpolates when "when-finished"
> program is run, reading from V.??.pid, so somebody needs to make
> sure these pid files will stay around.  I do not think it is an
> issue as I suspect we've left it to the global clean-up procedure
> that removes the trash directory to remove the pid file.

In the original the same shell process starts 'git fast-import',
writes its pidfile, and registers the test_when_finished commands, so
we can be sure that the pid file is already present when the shell
runs the $(cat V.pid) command substitutions.

With this patch that's not the case anymore, because the background
subshell starts 'git fast-import' and writes the pidfile, but the main
shell process registers the test_when_finished commands.  IOW these
two shell processes are racing, and it's possible that the
test_when_finished command is executed before the background subshell
can write the pidfile.  So double quotes around the block of
test_when_finished commands are not good.

> By the way, does the second "kill && wait" wait for the right
> process?

Ouch, it clearly doesn't.  Copy-paste error I suppose.
Thanks for spotting it.

> 
> >  background_import_still_running () {
> > -	if ! kill -0 "$(cat V.pid)"
> > +	if ! kill -0 "$(cat V.fi.pid)"
> >  	then
> >  		echo >&2 "background fast-import terminated too early"
> >  		false
> >  	fi
> >  }

  reply	other threads:[~2019-12-01  9:33 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-30 10:46 [PATCH] t9300-fast-import: don't hang if background fast-import exits too early SZEDER Gábor
2019-11-30 21:16 ` Junio C Hamano
2019-12-01  9:31   ` SZEDER Gábor [this message]
2019-12-01 15:38     ` Junio C Hamano
2019-12-06 19:03 ` [PATCH v2 0/2] " SZEDER Gábor
2019-12-06 19:03   ` [PATCH v2 1/2] t9300-fast-import: store the PID in a variable instead of pidfile SZEDER Gábor
2019-12-06 19:03   ` [PATCH v2 2/2] t9300-fast-import: don't hang if background fast-import exits too early SZEDER Gábor

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=20191201093148.GH23183@szeder.dev \
    --to=szeder.dev@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.