From: Han Xin <hanxin.hx@bytedance.com>
To: hanxin.hx@bytedance.com
Cc: chiyutianyi@gmail.com, derrickstolee@github.com,
git@vger.kernel.org, haiyangtand@gmail.com,
jonathantanmy@google.com, peff@peff.net, git@grubix.eu,
me@ttaylorr.com, Junio C Hamano <gitster@pobox.com>,
ps@pks.im
Subject: [PATCH v5 0/1] no lazy fetch in lookup_commit_in_graph()
Date: Tue, 12 Jul 2022 14:50:46 +0800 [thread overview]
Message-ID: <cover.1657604799.git.hanxin.hx@bytedance.com> (raw)
In-Reply-To: <cover.1656593279.git.hanxin.hx@bytedance.com>
This patch fixes the following issue:
When we found the commit in the graph in lookup_commit_in_graph(),
but the commit is missing from the repository, we will try
promisor_remote_get_direct() and then enter another loop.
Then we will go into an endless loop:
git fetch -> deref_without_lazy_fetch() ->
lookup_commit_in_graph() -> repo_has_object_file() ->
promisor_remote_get_direct() -> fetch_objects() ->
git fetch (a new loop round)
Changes since v4:
* Remove run_with_limited_processses() as it can be catched by CI
settings and developer workstation. Keeping it will make a trouble
when there are too many prcesses or stress is used.
Han Xin (1):
commit-graph.c: no lazy fetch in lookup_commit_in_graph()
commit-graph.c | 2 +-
t/t5330-no-lazy-fetch-with-commit-graph.sh | 47 ++++++++++++++++++++++
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100755 t/t5330-no-lazy-fetch-with-commit-graph.sh
Range-diff against v4:
1: 96d4bb7150 ! 1: 3ffeed50de commit-graph.c: no lazy fetch in lookup_commit_in_graph()
@@ t/t5330-no-lazy-fetch-with-commit-graph.sh (new)
+
+. ./test-lib.sh
+
-+run_with_limited_processses () {
-+ # bash and ksh use "ulimit -u", dash uses "ulimit -p"
-+ if test -n "$BASH_VERSION"
-+ then
-+ ulimit_max_process="-u"
-+ elif test -n "$KSH_VERSION"
-+ then
-+ ulimit_max_process="-u"
-+ fi
-+ (ulimit ${ulimit_max_process-"-p"} 512 && "$@")
-+}
-+
-+test_lazy_prereq ULIMIT_PROCESSES '
-+ run_with_limited_processses true
-+'
-+
-+if ! test_have_prereq ULIMIT_PROCESSES
-+then
-+ skip_all='skipping tests for no lazy fetch with the commit-graph, ulimit processes not available'
-+ test_done
-+fi
-+
+test_expect_success 'setup: prepare a repository with a commit' '
+ git init with-commit &&
+ test_commit -C with-commit the-commit &&
@@ t/t5330-no-lazy-fetch-with-commit-graph.sh (new)
+ git -C with-commit-graph config remote.origin.partialclonefilter blob:none &&
+ test_commit -C with-commit any-commit &&
+ anycommit=$(git -C with-commit rev-parse HEAD) &&
-+
-+ run_with_limited_processses env GIT_TRACE="$(pwd)/trace.txt" \
++ GIT_TRACE="$(pwd)/trace.txt" \
+ git -C with-commit-graph fetch origin $anycommit 2>err &&
+ ! grep "fatal: promisor-remote: unable to fork off fetch subprocess" err &&
+ grep "git fetch origin" trace.txt >actual &&
--
2.36.1
next prev parent reply other threads:[~2022-07-12 6:51 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 7:25 An endless loop fetching issue with partial clone, alternates and commit graph Haiyng Tan
2022-06-15 2:18 ` Taylor Blau
2022-06-16 3:38 ` [RFC PATCH 0/2] " Han Xin
2022-06-16 3:38 ` [RFC PATCH 1/2] commit-graph.c: add "flags" to lookup_commit_in_graph() Han Xin
2022-06-16 3:38 ` [RFC PATCH 2/2] fetch-pack.c: pass "oi_flags" " Han Xin
2022-06-17 21:47 ` [RFC PATCH 0/2] Re: An endless loop fetching issue with partial clone, alternates and commit graph Jonathan Tan
2022-06-18 3:01 ` [PATCH v1] commit-graph.c: no lazy fetch in lookup_commit_in_graph() Han Xin
2022-06-20 7:07 ` Patrick Steinhardt
2022-06-20 8:53 ` [External] " 欣韩
2022-06-20 9:05 ` Patrick Steinhardt
2022-06-21 18:23 ` Jonathan Tan
2022-06-22 3:17 ` Han Xin
2022-06-24 5:27 ` [PATCH v2 0/2] " Han Xin
2022-06-24 5:27 ` [PATCH v2 1/2] test-lib.sh: add limited processes to test-lib Han Xin
2022-06-24 16:03 ` Junio C Hamano
2022-06-25 1:35 ` Han Xin
2022-06-27 12:22 ` Junio C Hamano
2022-06-24 5:27 ` [PATCH v2 2/2] commit-graph.c: no lazy fetch in lookup_commit_in_graph() Han Xin
2022-06-24 16:56 ` Junio C Hamano
2022-06-25 2:25 ` Han Xin
2022-06-25 2:31 ` Han Xin
2022-06-28 2:02 ` [PATCH v3 0/2] " Han Xin
2022-06-28 2:02 ` [PATCH v3 1/2] test-lib.sh: add limited processes to test-lib Han Xin
2022-06-28 2:02 ` [PATCH v3 2/2] commit-graph.c: no lazy fetch in lookup_commit_in_graph() Han Xin
2022-06-28 7:49 ` Ævar Arnfjörð Bjarmason
2022-06-28 17:36 ` Junio C Hamano
2022-06-30 12:21 ` Johannes Schindelin
2022-06-30 13:43 ` Ævar Arnfjörð Bjarmason
2022-06-30 15:40 ` Junio C Hamano
2022-06-30 18:47 ` Ævar Arnfjörð Bjarmason
2022-07-01 19:31 ` Johannes Schindelin
2022-07-01 20:47 ` Junio C Hamano
2022-06-29 2:08 ` Han Xin
2022-06-30 17:37 ` test name conflict + js/ci-github-workflow-markup regression (was: [PATCH v3 0/2] no lazy fetch in lookup_commit_in_graph()) Ævar Arnfjörð Bjarmason
2022-07-01 1:34 ` [PATCH v4 0/1] no lazy fetch in lookup_commit_in_graph() Han Xin
2022-07-01 1:34 ` [PATCH v4 1/1] commit-graph.c: " Han Xin
2022-07-09 12:23 ` Michael J Gruber
2022-07-11 15:09 ` Jeff King
2022-07-11 20:17 ` Junio C Hamano
2022-07-12 1:52 ` [External] " Han Xin
2022-07-12 5:23 ` Junio C Hamano
2022-07-12 5:32 ` Han Xin
2022-07-12 6:37 ` [External] " Jeff King
2022-07-12 14:19 ` Junio C Hamano
2022-07-12 6:50 ` Han Xin [this message]
2022-07-12 6:50 ` [PATCH v5 " Han Xin
2022-07-12 9:50 ` Ævar Arnfjörð Bjarmason
2022-07-13 1:26 ` Han Xin
2022-07-12 6:58 ` [PATCH v5 0/1] " Jeff King
2022-07-12 8:01 ` [PATCH v1] t5330: remove run_with_limited_processses() Han Xin
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1657604799.git.hanxin.hx@bytedance.com \
--to=hanxin.hx@bytedance.com \
--cc=chiyutianyi@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=haiyangtand@gmail.com \
--cc=jonathantanmy@google.com \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=ps@pks.im \
/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.
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 NNTP newsgroup(s).