Junio C Hamano <gitster@xxxxxxxxx> writes: > Jeff King <peff@xxxxxxxx> writes: > >> >> A much more robust solution would be to stop conflating user-provided >> permanent .keep files with temporary locks. I think that was a mistaken >> design added many years ago. We probably could introduce a different >> filename for the temporary locks (though I am not entirely convinced >> they are necessary in the first place, as gc expiration-times would >> generally save a racily-written packfile anyway). > > True, true (and I tend to agree). > >> Or perhaps we could differentiate our temporary locks from "real" .keep >> files by looking at the content; I think our locks always say something >> like "(receive|receive)-pack \d+ on .*", and it wouldn't be too onerous >> to commit to that, I think (or even adjust it to something even more >> unambiguous). > > True, but it may be overkill to open and read. > >> It does muddy the meaning of packed_git.pack_keep a bit. Some callers >> would want to consider it kept in either case (i.e., for purposes of >> pruning, we delete neither) and some would want it kept only for >> non-locks (for packing, duplicating the objects is OK). So I think we'd >> end up with two bits there, and callers would have to use one or the >> other as appropriate. > > Yeah, I agree that we'd need to treat them separately in the longer > run. > > Thanks. In the meantime, this is about patch 2/1; the underlying "when .keep is there, disable bitmaps" is probably good to go, still. -- >8 -- From: Eric Wong <e@xxxxxxxxx> Date: Sat, 29 Jun 2019 19:13:59 +0000 Subject: [PATCH] repack: disable bitmaps-by-default if .keep files exist Bitmaps aren't useful with multiple packs, and users with .keep files ended up with redundant packs when bitmaps got enabled by default in bare repos. So detect when .keep files exist and stop enabling bitmaps by default in that case. Wasteful (but otherwise harmless) race conditions with .keep files documented by Jeff King still apply and there's a chance we'd still end up with redundant data on the FS: https://public-inbox.org/git/20190623224244.GB1100@xxxxxxxxxxxxxxxxxxxxx/ v2: avoid subshell in test case, be multi-index aware Fixes: 36eba0323d3288a8 ("repack: enable bitmaps by default on bare repos") Signed-off-by: Eric Wong <e@xxxxxxxxx> Helped-by: Jeff King <peff@xxxxxxxx> Reported-by: Janos Farkas <chexum@xxxxxxxxx> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- builtin/repack.c | 18 ++++++++++++++++-- t/t7700-repack.sh | 10 ++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/builtin/repack.c b/builtin/repack.c index caca113927..73250b2431 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -89,6 +89,17 @@ static void remove_pack_on_signal(int signo) raise(signo); } +static int has_pack_keep_file(void) +{ + struct packed_git *p; + + for (p = get_all_packs(the_repository); p; p = p->next) { + if (p->pack_keep) + return 1; + } + return 0; +} + /* * Adds all packs hex strings to the fname list, which do not * have a corresponding .keep file. These packs are not to @@ -343,9 +354,12 @@ 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) + if (write_bitmaps < 0) { write_bitmaps = (pack_everything & ALL_INTO_ONE) && - is_bare_repository(); + is_bare_repository() && + keep_pack_list.nr == 0 && + !has_pack_keep_file(); + } if (pack_kept_objects < 0) pack_kept_objects = write_bitmaps; diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh index 86d05160a3..0e9af832c9 100755 --- a/t/t7700-repack.sh +++ b/t/t7700-repack.sh @@ -239,4 +239,14 @@ test_expect_success 'bitmaps can be disabled on bare repos' ' test -z "$bitmap" ' +test_expect_success 'no bitmaps created if .keep files present' ' + pack=$(ls bare.git/objects/pack/*.pack) && + test_path_is_file "$pack" && + keep=${pack%.pack}.keep && + >"$keep" && + git -C bare.git repack -ad && + find bare.git/objects/pack/ -type f -name "*.bitmap" >actual && + test_must_be_empty actual +' + test_done -- 2.22.0-214-g8dca754b1e
