Elijah Newren wrote: > On Wed, Jun 29, 2022 at 3:04 PM Victoria Dye <vdye@xxxxxxxxxx> wrote: >> >> Dian Xu wrote: >>> Dear Git developers, >>> >>> Reporting Issue: >>> 'git add' hangs in a large repo which has >>> sparse-checkout file with large number of patterns in it >>> >>> Found in: >>> Git 2.34.3. Issue occurs after 'audit for interaction >>> with sparse-index' was introduced in add.c >>> >>> Reproduction steps: >>> 1. Clone a repo which has e.g. 2 million plus files >>> 2. Enable sparse checkout by: git config core.sparsecheckout true >>> 3. Create a .git/info/sparse-checkout file with a large >>> number of patterns, e.g. 16k plus lines >>> 4. Run 'git add', which will hang> >>> Investigations: >>> 1. Stack trace: >>> add.c: cmd_add >>> -> add.c: prune_directory >>> -> pathspec.c: add_pathspec_matches_against_index >>> -> dir.c: path_in_sparse_checkout_1 >>> 2. In Git 2.33.3, the loop at pathspec.c line 42 runs >>> fast, even when istate->cache_nr is at 2 million >>> 3. Since Git 2.34.3, the newly introduced 'audit for >>> interaction with sparse-index' (dir.c line 1459: >>> path_in_sparse_checkout_1) decides to loop through 2 million files and >>> match each one of them against the sparse-checkout patterns >>> 4. This hits the O(n^2) problem thus causes 'git add' to >>> hang (or ~1.5 hours to finish) >> >> Thanks for the explanation, it helped me narrow down the source to an exact >> commit (49fdd51a23 (add: skip tracked paths outside sparse-checkout cone, >> 2021-09-24)). >> >> You're correct that the `path_in_sparse_checkout()` check is slow [1]. >> However, it only runs on files that are not "hidden" with the >> `SKIP_WORKTREE` flag. Ideally, if you're using sparse-checkout, this will >> only be a small subset of your 2 million files. >> >> In your repro steps, you're adding patterns to a file then immediately >> running `git add`. If that reflects how you're usually working with >> sparse-checkout, `SKIP_WORKTREE` likely isn't being applied properly before >> the `add`. You can check to see whether file(s) have the flag properly >> applied with `git ls-files -t <file or dir names>` - each `SKIP_WORKTREE` >> file should have an "S" next to it. "H" indicates that the flag is *not* >> applied. >> >> If you see that most of the files that *should* be sparse don't have >> `SKIP_WORKTREE` applied, you can run `git sparse-checkout reapply` (make >> sure you don't have any modified files outside the patterns you're >> applying!). The downside is that it'll be as slow as what you're reporting >> for `git add`, but any subsequent `add` (or reset, status, etc.) should be >> much faster. >> >> If you do all of that but things are still slow, then the way we check >> pathspecs in `git add` would need to change (not trivial, but probably not >> impossible either). At a cursory glance, I can think of a few options for >> that: >> >> 1. Remove the `path_in_sparse_checkout()` check. It's the simplest solution, >> but it means you'd be able to stage files for commit outside the >> sparse-checkout patterns without using the '--sparse' option. I don't >> personally think that's a huge issue, but given that the implementation >> was intentionally changed *away* from this approach, I'd defer to other >> contributors to see if that's an okay change to make. > > I'm strongly against this. This just restores the original bug we > were trying to fix, attempts to paper over the fact that non-cone mode > is fundamentally O(N*M) in one small instance, and sets the precedent > that we can't fix further sparse-checkout-based usability bugs because > it might add performance bottlenecks in additional places given > non-cone-mode's fundamental performance design problem. We should > instead (in rough priority order) I'm not sure what the bug was - although I can (and should) read through the list archive to find out - but the rest of your point is convincing enough on its own. Even if we sacrificed correctness for performance in this one case, there are countless other places in the code like it, and changing all of them could seriously hurt user experience in other ways. Thanks for your perspective! > > * encourage people to adopt cone mode > * discourage people still using non-cone mode from having lots of patterns While I know these are the recommended best practice, I do want to acknowledge that switching to cone mode in some repositories is a huge lift or otherwise infeasible [1]. While people make that transition (if they even can), I don't think it's unreasonable to look for ways to improve performance in non-cone sparse checkout, especially if those performance gains can also be realized in cone mode. [1] https://lore.kernel.org/git/nycvar.QRO.7.76.6.2205212347060.352@xxxxxxxxxxxxxxxxx/ > * make sure people aren't misusing things (the lack of a `git > read-tree -mu HEAD` or `git sparse-checkout reapply` seemed very > suspicious) A warning if a particular git operation sees a lot of out-of-cone non-`SKIP_WORKTREE` files might help with this (and would be especially impactful for someone working with a sparse index). I'm not sure how to quantify "a lot", though. > * educate people that non-cone mode is just fundamentally slow, among > other problems, and that the slowness might appear in additional > places in the future as we fix various usability issues. > * provide workarounds users can adopt if they really want to persist > with non-cone mode with lots of patterns (e.g. add "--sparse" to their > "git add" commands), though warn them about the possible side effects > they'll face (the added files can seemingly randomly disappear in the > working tree with future checkout/pull/merge/rebase/reset/etc commands > if the added files don't match the sparsity patterns). > * investigate ways to optimize the code to lower the constant in the > O(N*M) behavior on a case-by-case basis > > We deprecated non-cone mode in v2.37 in part because of this type of > issue, and I really don't want the see the deprecated side of things > dictating how commands work for the now-default mode. > >> 2. After every call to `ce_path_match()`, check if all pathspecs are marked >> as `seen` and, if so, return early. This would slow down each individual >> file check and wouldn't help you if a pathspec matches nothing, but >> prevents checking more files once all pathspecs are matched. > > Might be interesting. Would need some careful measurements and > attempts to validate how often all pathspecs are matched early in some > kind of way, because this would definitely slow down some cases and > speed others up, but I don't have a good feel for which side happens > more frequently in practice. > >> 3. Do some heuristic checks on the pathspecs before checking index entries. >> For example, exact file or directory matches could be searched in the >> index. This would still require falling back on the per-file checks if >> not all pathspecs are matched, but makes some typical use-cases much >> faster. > > I'm confused. "before checking index entries", you're checking things > (namely, exact file or directory matches) "in the index"? Sorry, I definitely wasn't clear. I mean "perform heuristic checks *per pathspec item* before iterating *per index entry*." Pathspecs used in `git add` are (at least in my experience) pretty small, so there could be performance gains if all the items can be marked `seen` without iterating over every entry of the index. I was thinking something like `pathspec_needs_expanded_index()` in `reset` (4d1cfc1351 (reset: make --mixed sparse-aware, 2021-11-29)), but tailored to this particular case. > >> There are almost certainly other options, and I can dig around `add.c` more >> to see if there's anything I'm missing (although I'd love to hear other >> ideas too!). >> >> Hopefully this helps! >> - Victoria >> >> [1] `path_in_sparse_checkout()` is significantly faster in cone mode, but >> with 16k patterns I'm assuming you're not using cone patterns ;) >> >>> >>> Please help us take a look at this issue and let us know if you need >>> more information. >>> >>> Thanks, >>> >>> Dian Xu >>> Mathworks, Inc >>> 1 Lakeside Campus Drive, Natick, MA 01760 >>> 508-647-3583 >>
