From: Taylor Blau <me@ttaylorr.com>
To: Anh Le via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Timothy Jones <timothy@canva.com>,
Jeff Hostetler <jeffhost@microsoft.com>,
Jeff Hostetler <git@jeffhostetler.com>,
Derrick Stolee <derrickstolee@github.com>, Anh Le <anh@canva.com>
Subject: Re: [PATCH v3] index: add trace2 region for clear skip worktree
Date: Mon, 31 Oct 2022 18:34:30 -0400 [thread overview]
Message-ID: <Y2BNdvgCw/mxgV1M@nand.local> (raw)
In-Reply-To: <pull.1368.v3.git.git.1667177791591.gitgitgadget@gmail.com>
On Mon, Oct 31, 2022 at 12:56:31AM +0000, Anh Le via GitGitGadget wrote:
> From: Anh Le <anh@canva.com>
>
> In a large repository using sparse checkout, checking whether a file marked
> with skip worktree is present on disk and its skip worktree bit should be
> cleared can take a considerable amount of time. Add a trace2 region to
> surface this information, keeping a count of how many paths have been
> checked and separately keep counts for after a full index is materialised.
I think the text you wrote here is fine, but it did take me a couple of
passes to make sure I understood it correctly.
Perhaps the following might be clearer:
When using sparse checkout, clear_skip_worktree_from_present_files()
must enumerate index entries to find ones with the SKIP_WORKTREE bit
to determine whether those index entries exist on disk (in which
case their SKIP_WORKTREE bit should be removed).
In a large repository, this may take considerable time depending on
the size of the index.
Add a trace2 region to surface this information, keeping a count o
fhow many paths have been checked. Separately, keep counts after a
full index is materialized.
Is that accurate?
> diff --git a/sparse-index.c b/sparse-index.c
> index e4a54ce1943..8301129bf8f 100644
> --- a/sparse-index.c
> +++ b/sparse-index.c
> @@ -493,24 +493,42 @@ void clear_skip_worktree_from_present_files(struct index_state *istate)
> int dir_found = 1;
>
> int i;
> + int path_count[2] = {0, 0};
> + int restarted = 0;
Looks good.
> if (!core_apply_sparse_checkout ||
> sparse_expect_files_outside_of_patterns)
> return;
>
> + trace2_region_enter("index", "clear_skip_worktree_from_present_files",
> + istate->repo);
Here and below, there is some funky indentation. When I apply the patch
locally, I find that I need to squash this in:
--- >8 ---
diff --git a/sparse-index.c b/sparse-index.c
index 8301129bf8..23f997e103 100644
--- a/sparse-index.c
+++ b/sparse-index.c
@@ -501,7 +501,7 @@ void clear_skip_worktree_from_present_files(struct index_state *istate)
return;
trace2_region_enter("index", "clear_skip_worktree_from_present_files",
- istate->repo);
+ istate->repo);
restart:
for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce = istate->cache[i];
--- 8< ---
> restart:
> for (i = 0; i < istate->cache_nr; i++) {
> struct cache_entry *ce = istate->cache[i];
>
> - if (ce_skip_worktree(ce) &&
> - path_found(ce->name, &last_dirname, &dir_len, &dir_found)) {
> - if (S_ISSPARSEDIR(ce->ce_mode)) {
> - ensure_full_index(istate);
> - goto restart;
> + if (ce_skip_worktree(ce)) {
> + path_count[restarted]++;
> + if (path_found(ce->name, &last_dirname, &dir_len, &dir_found)) {
> + if (S_ISSPARSEDIR(ce->ce_mode)) {
> + if (restarted)
> + BUG("ensure-full-index did not fully flatten?");
> + ensure_full_index(istate);
> + restarted = 1;
> + goto restart;
> + }
> + ce->ce_flags &= ~CE_SKIP_WORKTREE;
> }
> - ce->ce_flags &= ~CE_SKIP_WORKTREE;
Looks fine, though the "if (restarted) BUG(...)" is new. It's not wrong,
per-se, but seeing it in a separate commit either before or after the
main change would be appreciated.
> }
> }
> +
> + if (path_count[0])
> + trace2_data_intmax("index", istate->repo,
> + "sparse_path_count", path_count[0]);
> + if (restarted)
> + trace2_data_intmax("index", istate->repo,
> + "sparse_path_count_full", path_count[1]);
> + trace2_region_leave("index", "clear_skip_worktree_from_present_files",
> + istate->repo);
Same note about indentation here.
Thanks,
Taylor
next prev parent reply other threads:[~2022-10-31 22:34 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-26 0:05 [PATCH] index: add trace2 region for clear skip worktree Anh Le via GitGitGadget
2022-10-26 3:16 ` Junio C Hamano
2022-10-26 14:13 ` Jeff Hostetler
2022-10-26 16:01 ` Junio C Hamano
2022-10-26 18:29 ` Jeff Hostetler
2022-10-27 0:04 ` Anh Le
2022-10-28 0:46 ` [PATCH v2] " Anh Le via GitGitGadget
2022-10-28 15:49 ` Derrick Stolee
2022-10-28 17:17 ` Junio C Hamano
2022-10-30 23:28 ` Anh Le
2022-10-28 16:50 ` Jeff Hostetler
2022-10-31 0:56 ` [PATCH v3] " Anh Le via GitGitGadget
2022-10-31 22:34 ` Taylor Blau [this message]
2022-11-03 23:04 ` [PATCH v4 0/2] " Anh Le via GitGitGadget
2022-11-03 23:05 ` [PATCH v4 1/2] " Anh Le via GitGitGadget
2022-11-03 23:05 ` [PATCH v4 2/2] index: raise a bug if the index is materialised more than once Anh Le via GitGitGadget
2022-11-05 0:29 ` [PATCH v4 0/2] index: add trace2 region for clear skip worktree Taylor Blau
2022-11-07 20:50 ` Derrick Stolee
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y2BNdvgCw/mxgV1M@nand.local \
--to=me@ttaylorr.com \
--cc=anh@canva.com \
--cc=derrickstolee@github.com \
--cc=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jeffhost@microsoft.com \
--cc=timothy@canva.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).