Re: commit-graph is cool (overcoming add_missing_tags() perf issues)

From: Elijah Newren <newren@gmail.com>
Date: Oct 31, 2018, 05:45 UTC
Message-ID: <CABPp-BHPZD2zRkrbAFOEp4KAT+fAvO4KzFrCsk_Pyy5V65t=ig@mail.gmail.com>
In-Reply-To: <302a9351-6133-f562-8c5a-d688d5cc3c88@gmail.com>

On Tue, Oct 30, 2018 at 7:22 AM Derrick Stolee <stolee@gmail.com> wrote:

Show 30 quoted lines

>
> On 10/17/2018 2:00 PM, Elijah Newren wrote:
> > Hi,
> >
> > Just wanted to give a shout-out for the commit-graph work and how
> > impressive it is.  I had an internal report from a user that git
> > pushes containing only one new tiny commit were taking over a minute
> > (in a moderate size repo with good network connectivity). After
> > digging for a while, I noticed three unusual things about the repo[1]:
> >    * he had push.followTags set to true
> >    * upstream repo had about 20k tags (despite only 55k commits)
> >    * his repo had an additional 2.5k tags, but none of these were in
> >      the history of the branches he was pushing and thus would not be
> >      included in any pushes.
> >
> > Digging in, almost all the time was CPU-bound and spent in
> > add_missing_tags()[2].  If I'm reading the code correctly, it appears
> > that function loops over each tag, calling in_merge_bases_many() once
> > per tag.  Thus, for his case, we were potentially walking all of
> > history of the main branch 2.5k times.  That seemed rather suboptimal.
>
> Elijah,
>
> Do you still have this repo around? Could you by chance test the
> performance with the new algorithm for add_missing_tags() in [1]?
> Specifically, please test it without a commit-graph file, since your
> data shape already makes use of generation numbers pretty well.
>
> Thanks,
> -Stolee

I nuked it, but turns out I had a backup that I found after digging around for a bit. I'll post a comment on the series with the results.

By the way, I've been running pu for about a week with this tweak:

diff --git a/revision.c b/revision.c
index b5108b75ab..d20c687e71 100644
--- a/revision.c
+++ b/revision.c
@@ -1457,6 +1457,7 @@ void repo_init_revisions(struct repository *r,
        revs->pruning.change = file_change;
        revs->pruning.change_fn_data = revs;
        revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
+       revs->topo_order = 1;
        revs->dense = 1;
        revs->prefix = prefix;
        revs->max_age = -1;

Only ran into one small problem once, and it wasn't commit-graph
related; rather it was related to my above patch and needing to not
have topo_order be set.  (I just bailed and used my older
system-installed git from /usr/bin/ in that one case.)  So, I think
the commit-graph stuff is looking pretty good, and I find the recent
thread on further improvements with corrected commit date (among other
possibilities) very intriguing...even if I haven't had much time to
comment or test recently.