undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scalar: only warn when background maintenance fails

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee 2023-01-27 20:06:03 +00:00 committed by Junio C Hamano
parent eeea9ae165
commit dea6308892
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scalar.c
View File

@ -262,7 +262,7 @@ static int register_dir(void)
return error(_("could not set recommended config")); return error(_("could not set recommended config"));
if (toggle_maintenance(1)) if (toggle_maintenance(1))
return error(_("could not turn on maintenance")); warning(_("could not turn on maintenance"));
if (have_fsmonitor_support() && start_fsmonitor_daemon()) { if (have_fsmonitor_support() && start_fsmonitor_daemon()) {
return error(_("could not start the FSMonitor daemon")); return error(_("could not start the FSMonitor daemon"));

4
t/t9210-scalar.sh
View File

@ -104,10 +104,10 @@ test_expect_success FSMONITOR_DAEMON 'scalar register starts fsmon daemon' '
test_cmp_config -C test/src true core.fsmonitor 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 init register-repo &&
GIT_TEST_MAINT_SCHEDULER="crontab:false,launchctl:false,schtasks:false" \ 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 grep "could not turn on maintenance" err
' '

4
t/t9211-scalar-clone.sh
View File

@ -174,9 +174,9 @@ test_expect_success 'progress without tty' '
cleanup_clone $enlistment 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" \ 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 grep "could not turn on maintenance" err
' '