On Thu, Dec 20, 2018 at 04:41:50PM +0000, Thomas Gummerer wrote:
> > That doesn't really fix it, but just broadens the race window. I dunno.
> > Maybe that is enough in practice. We could do something like:
> >
> > repeat_with_timeout () {
> > local i=0
> > while test $i -lt 10
> > do
> > "$@" && return 0
> > sleep 1
> > done
> > # no success even after 10 seconds
> > return 1
> > }
> >
> > repeat_with_timeout grep -i extended.attribute daemon.log
> >
> > to make the pattern a bit more obvious (and make it easy to extend the
> > window arbitrarily; surely 10s is enough?).
>
> I gave this a try, with below patch to lib-git-daemon.sh that you
> proposed in the previous thread about this racyness. That shows
> another problem though, namely when truncating 'daemon.log' before
> running 'git ls-remote' in this test, we're not sure all 'git deamon'
> has flushed everything from previous invocations. That may be an even
> rarer problem in practice, but still something to keep in mind.
Right, that makes sense. Making this race-proof really does require a
separate log stream for each test. I guess we'd need to be able to send
git-daemon a signal to re-open the log (which actually is not as
unreasonable as it may seem; lots of daemons have this for log
rotation).
I think getting rid of the "cat" would also help a lot here.
Unfortunately I think we use it not just for its "tee" effect, but also
to avoid startup races by checking the "Ready to rumble" line. So again,
we'd need some cooperation from git-daemon to tell us out-of-band that
it has completed its startup (e.g., by touching another file).
> Dscho also mentioned on #git-devel a while ago that he may have a look
> at actually making this test race-proof, but I guess he's been busy
> with the 2.20 release. I'm also not sure it's worth spending a lot of
> time trying to fix this test, but I'd definitely be happy if someone
> proposes a different solution.
Yeah. I'm sure it's fixable with enough effort, but I just think there
are more interesting and important things to work on.
> --- >8 ---
> Subject: [PATCH] t5570: drop racy test
So yeah, I'm still fine with this. But...
> ---
> t/t5570-git-daemon.sh | 13 -------------
> 1 file changed, 13 deletions(-)
This is the only user of daemon.log, so we could drop those bits from
lib-git-daemon.sh, too. That would also prevent people from adding new
tests, thinking that this was somehow not horribly racy). I.e.,
reverting 314a73d658 (t/lib-git-daemon: record daemon log, 2018-01-25).
-Peff
