From: Jeff King <peff@peff.net>
To: Stephan Beyer <s-beyer@gmx.net>
Cc: git@vger.kernel.org, Tarmigan Casebolt <tarmigan+git@gmail.com>
Subject: Re: [PATCH] t5561: get rid of racy appending to logfile
Date: Thu, 24 Sep 2015 14:23:06 -0400 [thread overview]
Message-ID: <20150924182306.GA15647@sigill.intra.peff.net> (raw)
In-Reply-To: <1443118342-3856-1-git-send-email-s-beyer@gmx.net>
On Thu, Sep 24, 2015 at 08:12:22PM +0200, Stephan Beyer wrote:
> The definition of log_div() appended information to the web server's
> logfile to make the test more readable. However, log_div() was called
> right after a request is served (which is done by git-http-backend);
> the web server waits for the git-http-backend process to exit before
> it writes to the log file. When the duration between serving a request
> and exiting was long, the log_div() output was written before the last
> request's log, and the test failed. (This duration could become
> especially long for PROFILE=GEN builds.)
>
> To get rid of this behavior, we should not change the logfile at all.
> This commit removes log_div() and its calls. The additional information
> is kept in the test (for readability reasons) but filtered out before
> comparing it to the actual logfile.
>
> Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
> ---
> Okay Peff, I added the information to the commit message (in my own
> words). Past tense for the situation before the patch, present tense
> for the situation after (hope that's right but should not be too
> important).
>
> I also used your proposed grep line because it is probably more robust.
This all looks good to me. Thanks so much for working on this.
> -cat >exp <<EOF
> +grep '^[^#]' >exp <<EOF
One quick note for others who are reviewing: this violates our usual
advice to use "<<-\EOF" for here-docs, but I think it's best as-is.
We can't use "\" here because we _do_ want interpolation. The reason to
use "<<-" is to match indentation with the rest of the test block. This
particular content is outside a test block, which is something we
typically avoid. But in this case, the expected content is essentially
the whole of the script, and I think it reads a little more easily
outside.
So I don't think there is anything to change, but I wanted to point out
my thought process so other reviewers don't end up repeating it.
-Peff
next prev parent reply other threads:[~2015-09-24 18:23 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-22 23:21 t5561 failing after make PROFILE=GEN Stephan Beyer
2015-09-23 23:24 ` Jeff King
2015-09-24 0:20 ` [PATCH] t5561: get rid of racy appending to logfile Stephan Beyer
2015-09-24 1:45 ` Jeff King
2015-09-24 18:12 ` Stephan Beyer
2015-09-24 18:23 ` Jeff King [this message]
2015-09-25 15:50 ` Junio C Hamano
2015-09-24 0:22 ` t5561 failing after make PROFILE=GEN Stephan Beyer
2015-09-24 1:41 ` Jeff King
-- strict thread matches above, loose matches on Subject: below --
2015-09-24 23:31 [PATCH] t5561: get rid of racy appending to logfile Stephan Beyer
2015-09-25 17:44 ` Junio C Hamano
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=20150924182306.GA15647@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=s-beyer@gmx.net \
--cc=tarmigan+git@gmail.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.
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).