From: Jeff King <peff@peff.net>
To: Jacob Vosmaer <jacob@gitlab.com>
Cc: gitster@pobox.com, me@ttaylorr.com, git@vger.kernel.org, ps@pks.im
Subject: Re: [PATCH v3 0/2] send_ref buffering
Date: Tue, 31 Aug 2021 06:25:30 -0400 [thread overview]
Message-ID: <YS4DmlJdjxeo+QI0@coredump.intra.peff.net> (raw)
In-Reply-To: <20210831093444.28199-1-jacob@gitlab.com>
On Tue, Aug 31, 2021 at 11:34:42AM +0200, Jacob Vosmaer wrote:
> Thanks for the reactions everyone. I agree that packet_fwrite_fmt
> simplifies the patch nicely. Jeff, I hope I have given you credit
> in an appropriate way, let me know if you want me to change something
> there.
What you did looks fine.
Overall the series looks much nicer, and I don't have any real
complaints. I do think it would be nice to take the packet_writer
interface further (letting it replace the static buf, and use stdio
handles, and using it throughout upload-pack). But this is a strict
improvement, so we can do that other refactoring later.
> Regarding setvbuf: I have found out that GNU coreutils has a utility
> called stdbuf that lets you modify the stdout buffer size at runtime
> using some LD_PRELOAD hack so we can use that in Gitaly. I don't
> think this is the best outcome for users, we ought to give them a
> good default instead of expecting them to invoke git-upload-pack
> as 'stdbuf -o 64K git-upload-pack'. But I can't judge the impact
> of globally changing the stdout buffer size for Git so I'll settle
> for having to use stdbuf.
Does the 64k buffer actually improve things? Here are the timings I get
on a repo with ~1M refs (it's linux.git with one ref per commit). "git"
is current unbuffered version, and "git.compile" is master with your
patches on top:
$ hyperfine -i 'git upload-pack .' 'git.compile upload-pack .' 'stdbuf -o 64K git.compile upload-pack .'
Benchmark #1: git upload-pack .
Time (mean ± σ): 948.6 ms ± 7.3 ms [User: 840.8 ms, System: 107.8 ms]
Range (min … max): 937.7 ms … 961.1 ms 10 runs
Warning: Ignoring non-zero exit code.
Benchmark #2: git.compile upload-pack .
Time (mean ± σ): 867.3 ms ± 6.8 ms [User: 821.5 ms, System: 45.7 ms]
Range (min … max): 859.7 ms … 883.0 ms 10 runs
Warning: Ignoring non-zero exit code.
Benchmark #3: stdbuf -o 64K git.compile upload-pack .
Time (mean ± σ): 861.1 ms ± 8.2 ms [User: 815.5 ms, System: 45.6 ms]
Range (min … max): 846.1 ms … 872.0 ms 10 runs
Warning: Ignoring non-zero exit code.
Summary
'stdbuf -o 64K git.compile upload-pack .' ran
1.01 ± 0.01 times faster than 'git.compile upload-pack .'
1.10 ± 0.01 times faster than 'git upload-pack .'
This is on a glibc system, so the default buffers should be 4k. It
doesn't appear to make any difference (there's a slight improvement, but
well within the noise, and I had other runs where it did worse).
By the way, if you really want to speed things up, try this:
$ hyperfine -i 'git.compile upload-pack .' 'GIT_REF_PARANOIA=1 git.compile upload-pack .'
Benchmark #1: git.compile upload-pack .
Time (mean ± σ): 855.4 ms ± 5.8 ms [User: 803.4 ms, System: 52.0 ms]
Range (min … max): 848.7 ms … 869.5 ms 10 runs
Warning: Ignoring non-zero exit code.
Benchmark #2: GIT_REF_PARANOIA=1 git.compile upload-pack .
Time (mean ± σ): 394.4 ms ± 3.0 ms [User: 357.9 ms, System: 36.4 ms]
Range (min … max): 390.6 ms … 400.3 ms 10 runs
Warning: Ignoring non-zero exit code.
Summary
'GIT_REF_PARANOIA=1 git.compile upload-pack .' ran
2.17 ± 0.02 times faster than 'git.compile upload-pack .'
It's not exactly the intended use of that environment variable, but its
side effect is that we do not call has_object_file() on each ref tip.
-Peff
next prev parent reply other threads:[~2021-08-31 10:25 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-24 14:02 [PATCH 1/1] upload-pack: buffer ref advertisement writes Jacob Vosmaer
2021-08-24 21:07 ` Taylor Blau
2021-08-24 21:42 ` Junio C Hamano
2021-08-25 0:44 ` Jeff King
2021-08-26 10:02 ` Jacob Vosmaer
2021-08-26 10:06 ` [PATCH 1/2] pkt-line: add packet_fwrite Jacob Vosmaer
2021-08-26 10:06 ` [PATCH 2/2] upload-pack: use stdio in send_ref callbacks Jacob Vosmaer
2021-08-26 16:33 ` Junio C Hamano
2021-08-26 20:21 ` Junio C Hamano
2021-08-26 22:35 ` Taylor Blau
2021-08-26 23:24 ` Jeff King
2021-08-27 16:15 ` Junio C Hamano
2021-08-31 9:34 ` [PATCH v3 0/2] send_ref buffering Jacob Vosmaer
2021-08-31 9:34 ` [PATCH v3 1/2] pkt-line: add stdio packet write functions Jacob Vosmaer
2021-08-31 10:37 ` Jeff King
2021-08-31 18:13 ` Junio C Hamano
2021-09-01 12:54 ` [PATCH v4 0/2] send_ref buffering Jacob Vosmaer
2021-09-01 12:54 ` [PATCH v4 1/2] pkt-line: add stdio packet write functions Jacob Vosmaer
2021-09-01 12:54 ` [PATCH v4 2/2] upload-pack: use stdio in send_ref callbacks Jacob Vosmaer
2021-09-02 9:18 ` [PATCH v4 0/2] send_ref buffering Jeff King
2021-08-31 9:34 ` [PATCH v3 2/2] upload-pack: use stdio in send_ref callbacks Jacob Vosmaer
2021-08-31 10:25 ` Jeff King [this message]
2021-08-31 13:08 ` [PATCH v3 0/2] send_ref buffering Jacob Vosmaer
2021-08-31 17:44 ` Jacob Vosmaer
2021-09-01 0:15 ` Jeff King
2021-08-26 23:32 ` [PATCH 2/2] upload-pack: use stdio in send_ref callbacks Jeff King
2021-08-26 16:33 ` [PATCH 1/2] pkt-line: add packet_fwrite 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=YS4DmlJdjxeo+QI0@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob@gitlab.com \
--cc=me@ttaylorr.com \
--cc=ps@pks.im \
/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).