Re: [PATCH] repack: enable bitmaps by default on bare repos
- From
- Eric Wong <e@80x24.org>
- Date
- Mar 13, 2019, 01:51 UTC
- Message-ID
- <20190313015133.n7f7lyujnlwfytre@dcvr>
- In-Reply-To
- <20190312104954.GA2023@sigill.intra.peff.net>
Jeff King <peff@peff.net> wrote:
> OK. I still think of bitmaps as something that might need manual care > and feeding, but I think that may be leftover superstition. I can't > offhand think of any real downsides to this.
It's a _relatively_ new feature to long-time users like us, so maybe the "new == immature" mindset sets in[*]. I skimmed some mail archives but couldn't find any reason not to...
But I did find Ævar's forgotten gitperformance doc and thread where the topic was brought up:
https://public-inbox.org/git/20170403211644.26814-1-avarab@gmail.com/
Show 19 quoted lines
> On Tue, Mar 12, 2019 at 03:13:03AM +0000, Eric Wong wrote:
> > @@ -343,11 +343,15 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
> > (unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE)))
> > die(_("--keep-unreachable and -A are incompatible"));
> >
> > + if (!(pack_everything & ALL_INTO_ONE)) {
> > + if (write_bitmaps > 0)
> > + die(_(incremental_bitmap_conflict_error));
> > + } else if (write_bitmaps < 0) {
> > + write_bitmaps = is_bare_repository();
> > + }
>
> Might it be easier here to always resolve "-1" into a 0/1? I.e., like:
>
> if (write_bitmaps < 0)
> write_bitmaps = (pack_everything & ALL_INTO_ONE) && is_bare_repository();
>
> and then the rest of the logic can stay the same, and does not need to
> be modified to handle "write_bitmaps < 0"?Good point, changed in v2.
Show 6 quoted lines
> > +test_expect_success 'bitmaps are created by default in bare repos' ' > > + git clone --bare .git bare.git && > > + cd bare.git && > > Please don't "cd" outside of a subshell, since it impacts further tests > that are added.
Oops, I got it into my head that each test was already run in a separate subshell :x Fixed.
Show 13 quoted lines
> > + mkdir old && > > + mv objects/pack/* old && > > + pack=$(ls old/*.pack) && > > Are we sure we have just done $pack here? Our repo came from a > local-disk clone, which would have just hard-linked whatever was in the > source repo. So we're subtly relying on the state that other tests have > left. > > I'm not sure what we're trying to accomplish with this unpacking, > though. Running "git repack -ad" should generate bitmaps whether the > objects were already in a single pack or not. So I think this test can > just be:
Right, I forgot "repack -a" didn't need loose objects to operate :x
> I do agree with Ævar it might also be worth testing that disabling > bitmaps explicitly still works. And also that repacking _without_ "-a" > (i.e., an incremental) does not complain about being unable to generate > bitmaps.
Yup, now with additional tests for repack.writeBitmaps=false, repack (w/o "-a") and a config/repack.txt update
------------8<--------- Subject: [PATCH] repack: enable bitmaps by default on bare repos
A typical use case for bare repos is for serving clones and fetches to clients. Enable bitmaps by default on bare repos to make it easier for admins to host git repos in a performant way.
Signed-off-by: Eric Wong <e@80x24.org> Helped-by: Jeff King <peff@peff.net> --- Documentation/config/repack.txt | 2 +- builtin/repack.c | 5 ++++- t/t7700-repack.sh | 19 ++++++++++++++++++- 3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/Documentation/config/repack.txt b/Documentation/config/repack.txt index a5c37813fd..9c413e177e 100644 --- a/Documentation/config/repack.txt +++ b/Documentation/config/repack.txt @@ -24,4 +24,4 @@ repack.writeBitmaps:: packs created for clones and fetches, at the cost of some disk space and extra time spent on the initial repack. This has no effect if multiple packfiles are created. - Defaults to false. + Defaults to true on bare repos, false otherwise. diff --git a/builtin/repack.c b/builtin/repack.c index 67f8978043..caca113927 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -14,7 +14,7 @@ static int delta_base_offset = 1; static int pack_kept_objects = -1; -static int write_bitmaps; +static int write_bitmaps = -1; static int use_delta_islands; static char *packdir, *packtmp; @@ -343,6 +343,9 @@ int cmd_repack(int argc, const char **argv, const char *prefix) (unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE))) die(_("--keep-unreachable and -A are incompatible")); + if (write_bitmaps < 0) + write_bitmaps = (pack_everything & ALL_INTO_ONE) && + is_bare_repository(); if (pack_kept_objects < 0) pack_kept_objects = write_bitmaps; diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index 6162e2a8e6..6458286dcf 100755 --- a/t/t7700-repack.sh +++ b/t/t7700-repack.sh @@ -221,5 +221,22 @@ test_expect_success 'repack --keep-pack' ' ) ' -test_done +test_expect_success 'bitmaps are created by default in bare repos' ' + git clone --bare .git bare.git && + git -C bare.git repack -ad && + bitmap=$(ls bare.git/objects/pack/*.bitmap) && + test_path_is_file "$bitmap" +' + +test_expect_success 'incremental repack does not complain' ' + git -C bare.git repack -q 2>repack.err && + ! test -s repack.err +' +test_expect_success 'bitmaps can be disabled on bare repos' ' + git -c repack.writeBitmaps=false -C bare.git repack -ad && + bitmap=$(ls bare.git/objects/pack/*.bitmap 2>/dev/null || :) && + test -z "$bitmap" +' + +test_done
-- EW