From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Matheus Tavares <matheus.bernardino@usp.br>,
Philippe Blain <levraiphilippeblain@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH v3 08/12] grep: allow submodule functions to run in parallel
Date: Wed, 29 Jan 2020 10:49:51 -0800 [thread overview]
Message-ID: <xmqq36byf67k.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20200129112613.GE10482@szeder.dev> ("SZEDER Gábor"'s message of "Wed, 29 Jan 2020 12:26:13 +0100")
SZEDER Gábor <szeder.dev@gmail.com> writes:
> this patch below and a7f3240877 (grep: ignore --recurse-submodules if
> --no-index is given, 2020-01-26) on topic
> 'pb/do-not-recurse-grep-no-index' don't work well together, and cause
> failure of the test 'grep --recurse-submodules --no-index ignores
> --recurse-submodules' in 't7814-grep-recurse-submodules.sh', i.e. in
> the new test added in a7f3240877.
Yup, I was looking at it and trying to see what was going on.
>> + if (recurse_submodules && (!use_index || untracked))
>> + die(_("option not supported with --recurse-submodules"));
>
> So this patch moves this condition here, expecting git to die with
> '--recurse-submodules --no-index'. However, a7f3240877 removes the
> '!use_index' part of the condition, so we won't die here ...
>
>> if (list.nr || cached || show_in_pager) {
>> if (num_threads > 1)
>> warning(_("invalid option combination, ignoring --threads"));
>> @@ -1071,6 +1072,14 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
>> && (opt.pre_context || opt.post_context ||
>> opt.file_break || opt.funcbody))
>> skip_first_line = 1;
>> +
>> + /*
>> + * Pre-read gitmodules (if not read already) to prevent racy
>> + * lazy reading in worker threads.
>> + */
>> + if (recurse_submodules)
>> + repo_read_gitmodules(the_repository, 1);
>
> ... and eventually reach this condition, which then reads the
> submodules even with '--no-index', which is just what a7f3240877 tried
> to avoid, thus triggering the test failure.
>
> It might be that all we need is changing this condition to:
>
> if (recurse_submodules && use_index)
>
> Or maybe not, but this change on top of 'pu' makes t7814 succeed
> again.
Sounds like a sensible idea.
next prev parent reply other threads:[~2020-01-29 18:49 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-10 20:27 [GSoC][PATCH 0/4] grep: re-enable threads when cached, w/ parallel inflation Matheus Tavares
2019-08-10 20:27 ` [GSoC][PATCH 1/4] object-store: add lock to read_object_file_extended() Matheus Tavares
2019-08-10 20:27 ` [GSoC][PATCH 2/4] grep: allow locks to be enabled individually Matheus Tavares
2019-08-10 20:27 ` [GSoC][PATCH 3/4] grep: disable grep_read_mutex when possible Matheus Tavares
2019-08-10 20:27 ` [GSoC][PATCH 4/4] grep: re-enable threads in some non-worktree cases Matheus Tavares
2019-09-30 1:50 ` [PATCH v2 00/11] grep: improve threading and fix race conditions Matheus Tavares
2019-09-30 1:50 ` [PATCH v2 01/11] grep: fix race conditions on userdiff calls Matheus Tavares
2019-09-30 1:50 ` [PATCH v2 02/11] grep: fix race conditions at grep_submodule() Matheus Tavares
2019-09-30 1:50 ` [PATCH v2 03/11] grep: fix racy calls in grep_objects() Matheus Tavares
2019-09-30 1:50 ` [PATCH v2 04/11] replace-object: make replace operations thread-safe Matheus Tavares
2019-09-30 1:50 ` [PATCH v2 05/11] object-store: allow threaded access to object reading Matheus Tavares
2019-11-12 2:54 ` Jonathan Tan
2019-11-13 5:20 ` Jeff King
2019-11-14 5:57 ` Matheus Tavares Bernardino
2019-11-14 6:01 ` Jeff King
2019-11-14 18:15 ` Jonathan Tan
2019-11-15 4:12 ` Jeff King
2019-12-19 22:27 ` Matheus Tavares Bernardino
2020-01-09 22:02 ` Matheus Tavares Bernardino
2020-01-10 19:07 ` Christian Couder
2019-09-30 1:50 ` [PATCH v2 06/11] grep: replace grep_read_mutex by internal obj read lock Matheus Tavares
2019-10-01 19:23 ` [PATCH] squash! " Matheus Tavares
2019-09-30 1:50 ` [PATCH v2 07/11] submodule-config: add skip_if_read option to repo_read_gitmodules() Matheus Tavares
2019-09-30 1:50 ` [PATCH v2 08/11] grep: allow submodule functions to run in parallel Matheus Tavares
2019-09-30 1:50 ` [PATCH v2 09/11] grep: protect packed_git [re-]initialization Matheus Tavares
2019-09-30 1:50 ` [PATCH v2 10/11] grep: re-enable threads in non-worktree case Matheus Tavares
2019-09-30 1:50 ` [PATCH v2 11/11] grep: move driver pre-load out of critical section Matheus Tavares
2020-01-16 2:39 ` [PATCH v3 00/12] grep: improve threading and fix race conditions Matheus Tavares
2020-01-16 2:39 ` [PATCH v3 01/12] grep: fix race conditions on userdiff calls Matheus Tavares
2020-01-16 2:39 ` [PATCH v3 02/12] grep: fix race conditions at grep_submodule() Matheus Tavares
2020-01-16 2:39 ` [PATCH v3 03/12] grep: fix racy calls in grep_objects() Matheus Tavares
2020-01-16 2:39 ` [PATCH v3 04/12] replace-object: make replace operations thread-safe Matheus Tavares
2020-01-16 2:39 ` [PATCH v3 05/12] object-store: allow threaded access to object reading Matheus Tavares
2020-01-16 2:39 ` [PATCH v3 06/12] grep: replace grep_read_mutex by internal obj read lock Matheus Tavares
2020-01-16 2:39 ` [PATCH v3 07/12] submodule-config: add skip_if_read option to repo_read_gitmodules() Matheus Tavares
2020-01-16 2:39 ` [PATCH v3 08/12] grep: allow submodule functions to run in parallel Matheus Tavares
2020-01-29 11:26 ` SZEDER Gábor
2020-01-29 18:49 ` Junio C Hamano [this message]
2020-01-29 18:57 ` Junio C Hamano
2020-01-29 20:42 ` Matheus Tavares Bernardino
2020-01-30 13:28 ` Philippe Blain
2020-01-16 2:39 ` [PATCH v3 09/12] grep: protect packed_git [re-]initialization Matheus Tavares
2020-01-16 2:39 ` [PATCH v3 10/12] grep: re-enable threads in non-worktree case Matheus Tavares
2020-01-16 2:39 ` [PATCH v3 11/12] grep: move driver pre-load out of critical section Matheus Tavares
2020-01-16 2:40 ` [PATCH v3 12/12] grep: use no. of cores as the default no. of threads Matheus Tavares
2020-01-16 13:11 ` Victor Leschuk
2020-01-16 14:47 ` [PATCH] " Matheus Tavares
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=xmqq36byf67k.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=levraiphilippeblain@gmail.com \
--cc=matheus.bernardino@usp.br \
--cc=szeder.dev@gmail.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).