Re: [PATCH v3] repack: enable bitmaps by default on bare repos

From: Jeff King <peff@peff.net>
Date: May 24, 2019, 08:26 UTC
Message-ID: <20190524082605.GB9082@sigill.intra.peff.net>
In-Reply-To: <87r28offs6.fsf@evledraar.gmail.com>

On Fri, May 24, 2019 at 09:55:05AM +0200, Ævar Arnfjörð Bjarmason wrote:

Show 9 quoted lines

> > I'm not sure what tickles the bitmap-writer to fail so hard. Is it
> > having too many refs? Weird patterns in the graph? Just a ton of
> > commits?
> 
> Ah, why did only this ancient (big) pack have a bitmap?
> 
> The bitmap writer had never failed, this was just a repository where
> some automation (on a dev/staging box) cloned a repo, and someone had
> once run a manual "repack" to make make a pack with a bitmap.

Just to be clear, by "fail" I didn't mean that the writer failed to produce. I just meant it had poor commit selection for its bitmap coverage. But...

Show 7 quoted lines

> Then as time passed that pack stayed around, and re-looking at this that
> could have only happened because I had gc.bigPackThreshold turned on.
> 
> I.e. without that we'd have eventually done a full repack, so the bitmap
> would have gone away.
> 
> So getting the repo into that state was a series of unlikely events.

Ah, now that's interesting. The issue may have just been that we had a ton of un-bitmapped commits because they weren't in the bitmapped pack at all. The logic that Stolee pointed out earlier:

          /*
           * if we have a HAVES list, but none of those haves is contained
           * in the packfile that has a bitmap, we don't have anything to
           * optimize here
           */
          if (haves && !in_bitmapped_pack(bitmap_git, haves))
                  goto cleanup;

is pretty feeble. If you have even _one_ UNINTERESTING tip that's in the pack, we'll try to use bitmaps. And in your case, you almost certainly had old tags on both the client and the server there were in the old bitmapped pack, but then a huge swath of history that had happened since then. And it was that newer part of the graph that we had to walk to fill in the bitmap.

So all of this makes pretty good sense to me now. Bitmaps work incrementally as you add new, un-bitmapped history. But the cost gets higher and higher the longer you go before repacking and generating new bitmaps. So your case was very similar to a repo that uses bitmaps but just hadn't packed in a really long time.

> I think to the extent that this is an issue we can reproduce in the
> future the proper fix for it in lieu of some easy fix in the bitmap code
> would be to just teach "gc" to unlink old *.bitmap files if we detect
> they're too stale.

Yeah. This could happen if you simply accumulated history without ever running "gc". But in general we can probably assume that "gc" will run periodically (though there is a real blind spot if you push up a very huge chunk of history in one pack, since gc counts packs, not objects).

I agree that if gc is deciding to leave a big pack, it should probably ditch the bitmaps for it.

> I.e. we don't need to deal gracefully with some case where the bitmaps
> just cover some tiny part of the graph, we can just teach "gc" to either
> update them, or (if we're not currently writing them) unlink them.

Unfortunately I don't think we can update them, because all of the reachable objects need to be in the same pack. So any scheme that isn't doing a periodic all-into-one repack probably shouldn't be using bitmaps. I wonder if we need to tweak Eric's bitmaps-by-default logic to better account for this.

> That seems to me to be a good idea in general, not just with bitmaps but
> also the commit graph. If we're doing a GC and our current settings
> aren't such that we'd update those files, shouldn't we just unlink them?

I don't think the commit graph would suffer from this. It's not tied to a specific pack, so it can be freely updated on any gc. You still have the problem when gc does not run. It's possible that auto-gc should have separate thresholds for different activities (e.g., number of packs should tell us when to repack objects, number of loose refs should tell us when to pack refs, number of un-annotated commits should tell us when to update the commit graph). The trouble is that some of those checks are non-trivial.

In the long run, I think the plan is for the commit graph to allow cheap incremental updating, which may make it reasonable to just update it preemptively after every fetch/push.

-Peff