From: Victoria Dye <vdye@github.com>
To: Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: gitster@pobox.com, Derrick Stolee <derrickstolee@github.com>
Subject: Re: [PATCH 3/3] scalar: only warn when background maintenance fails
Date: Fri, 27 Jan 2023 14:06:11 -0800 [thread overview]
Message-ID: <65b1735b-7ea6-5f7c-e1d9-6c986c7beb1d@github.com> (raw)
In-Reply-To: <d75780e0567b5f765816ab7522afe550ebaa3521.1674849963.git.gitgitgadget@gmail.com>
Derrick Stolee via GitGitGadget wrote:
> From: Derrick Stolee <derrickstolee@github.com>
>
> A user reported issues with 'scalar clone' and 'scalar register' when
> working in an environment that had locked down the ability to run
> 'crontab' or 'systemctl' in that those commands registered as _failures_
> instead of opportunistically reporting a success with just a warning
> about background maintenance.
>
> As a workaround, they can use GIT_TEST_MAINT_SCHEDULER to fake a
> successful background maintenance, but this is not a viable strategy for
> long-term.
>
> Update 'scalar register' and 'scalar clone' to no longer fail by
> modifying register_dir() to only warn when toggle_maintenance(1) fails.
>
> Since background maintenance is a "nice to have" and not a requirement
> for a working repository, it is best to move this from hard error to
> gentle warning.
>
> Signed-off-by: Derrick Stolee <derrickstolee@github.com>
> ---
> scalar.c | 2 +-
> t/t9210-scalar.sh | 4 ++--
> t/t9211-scalar-clone.sh | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/scalar.c b/scalar.c
> index f25d5f1d0ef..ca19b95ce46 100644
> --- a/scalar.c
> +++ b/scalar.c
> @@ -262,7 +262,7 @@ static int register_dir(void)
> return error(_("could not set recommended config"));
>
> if (toggle_maintenance(1))
> - return error(_("could not turn on maintenance"));
> + warning(_("could not turn on maintenance"));
Should we do the same thing for 'unregister_dir()'? Unlike 'register_dir()',
it doesn't break immediately (and finishes removing the enlistment), but it
still returns a nonzero error code from 'scalar unregister'.
>
> if (have_fsmonitor_support() && start_fsmonitor_daemon()) {
> return error(_("could not start the FSMonitor daemon"));
> diff --git a/t/t9210-scalar.sh b/t/t9210-scalar.sh
> index 13a4f6dbcf4..4432a30d10b 100755
> --- a/t/t9210-scalar.sh
> +++ b/t/t9210-scalar.sh
> @@ -104,10 +104,10 @@ test_expect_success FSMONITOR_DAEMON 'scalar register starts fsmon daemon' '
> test_cmp_config -C test/src true core.fsmonitor
> '
>
> -test_expect_success 'scalar register fails when background maintenance fails' '
> +test_expect_success 'scalar register warns when background maintenance fails' '
> git init register-repo &&
> GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \
> - test_must_fail scalar register register-repo 2>err &&
> + scalar register register-repo 2>err &&
> grep "could not turn on maintenance" err
> '
>
> diff --git a/t/t9211-scalar-clone.sh b/t/t9211-scalar-clone.sh
> index a6156da29ac..872ad1c9c2b 100755
> --- a/t/t9211-scalar-clone.sh
> +++ b/t/t9211-scalar-clone.sh
> @@ -174,9 +174,9 @@ test_expect_success 'progress without tty' '
> cleanup_clone $enlistment
> '
>
> -test_expect_success 'scalar clone fails when background maintenance fails' '
> +test_expect_success 'scalar clone warns when background maintenance fails' '
> GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \
> - test_must_fail scalar clone "file://$(pwd)/to-clone" maint-fail 2>err &&
> + scalar clone "file://$(pwd)/to-clone" maint-fail 2>err &&
> grep "could not turn on maintenance" err
> '
Similarly, it might be nice to show how 'scalar unregister' behaves when
maintenance fails in the tests.
next prev parent reply other threads:[~2023-01-27 22:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-27 20:06 [PATCH 0/3] Allow scalar to succeed despite maintenance failures Derrick Stolee via GitGitGadget
2023-01-27 20:06 ` [PATCH 1/3] t: allow 'scalar' in test_must_fail Derrick Stolee via GitGitGadget
2023-01-27 20:06 ` [PATCH 2/3] t921*: test scalar behavior starting maintenance Derrick Stolee via GitGitGadget
2023-01-27 20:06 ` [PATCH 3/3] scalar: only warn when background maintenance fails Derrick Stolee via GitGitGadget
2023-01-27 20:36 ` Junio C Hamano
2023-01-27 22:18 ` Derrick Stolee
2023-01-28 0:32 ` Junio C Hamano
2023-01-30 13:44 ` Derrick Stolee
2023-01-30 15:40 ` Junio C Hamano
2023-01-30 17:42 ` Victoria Dye
2023-01-30 18:58 ` Junio C Hamano
2023-01-30 19:06 ` Derrick Stolee
2023-01-27 22:18 ` Victoria Dye
2023-01-30 19:25 ` Derrick Stolee
2023-01-27 22:06 ` Victoria Dye [this message]
2023-01-27 22:14 ` 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=65b1735b-7ea6-5f7c-e1d9-6c986c7beb1d@github.com \
--to=vdye@github.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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).