From: Junio C Hamano <gitster@pobox.com>
To: "Neeraj Singh" <neerajsi@microsoft.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 1/2] t5351: avoid relying on `core.fsyncMethod = batch` to be supported
Date: Fri, 29 Jul 2022 09:07:46 -0700 [thread overview]
Message-ID: <xmqq1qu3aoml.fsf@gitster.g> (raw)
In-Reply-To: <501a89aa0b2de396b0c7b82b2e24046b9c98c382.1659097724.git.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Fri, 29 Jul 2022 12:28:43 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> On FreeBSD, this mode is not supported. But since 3a251bac0d1a (trace2:
> only include "fsync" events if we git_fsync(), 2022-07-18) t5351 will
> fail if this mode is unsupported.
>
> Let's address this in the minimal fashion, by detecting that that mode
> is unsupported and expecting a different count of hardware flushes in
> that case.
>
> This fixes the CI/PR builds on FreeBSD again.
>
> Note: A better way would be to test only what is relevant in t5351.6
> "unpack big object in stream (core.fsyncmethod=batch)" again instead of
> blindly comparing the output against some exact text. But that would
> pretty much revert the idea of above-mentioned commit, and that commit
> was _just_ accepted into Git's main branch so one must assume that it
> was intentional.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> bulk-checkin.c | 2 ++
> t/t5351-unpack-large-objects.sh | 10 ++++++++--
> 2 files changed, 10 insertions(+), 2 deletions(-)
I am inclined to take this as-is for now.
But it inherits from 3a251bac0d1a the general "we should be able to
count the value" expectation, which may not be the best approach to
run this test; asking Acks from those originally involved in this
area and possibly ideas to test this in a more robust way.
Thanks.
> diff --git a/bulk-checkin.c b/bulk-checkin.c
> index 98ec8938424..855b68ec23b 100644
> --- a/bulk-checkin.c
> +++ b/bulk-checkin.c
> @@ -340,6 +340,8 @@ void fsync_loose_object_bulk_checkin(int fd, const char *filename)
> */
> if (!bulk_fsync_objdir ||
> git_fsync(fd, FSYNC_WRITEOUT_ONLY) < 0) {
> + if (errno == ENOSYS)
> + warning(_("core.fsyncMethod = batch is unsupported on this platform"));
> fsync_or_die(fd, filename);
> }
> }
> diff --git a/t/t5351-unpack-large-objects.sh b/t/t5351-unpack-large-objects.sh
> index f785cb06173..dd7ebc40072 100755
> --- a/t/t5351-unpack-large-objects.sh
> +++ b/t/t5351-unpack-large-objects.sh
> @@ -70,9 +70,15 @@ test_expect_success 'unpack big object in stream (core.fsyncmethod=batch)' '
> GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
> GIT_TEST_FSYNC=true \
> git -C dest.git $BATCH_CONFIGURATION unpack-objects <pack-$PACK.pack &&
> - check_fsync_events trace2.txt <<-\EOF &&
> + if grep "core.fsyncMethod = batch is unsupported" trace2.txt
> + then
> + flush_count=7
> + else
> + flush_count=1
> + fi &&
> + check_fsync_events trace2.txt <<-EOF &&
> "key":"fsync/writeout-only","value":"6"
> - "key":"fsync/hardware-flush","value":"1"
> + "key":"fsync/hardware-flush","value":"$flush_count"
> EOF
>
> test_dir_is_empty dest.git/objects/pack &&
next prev parent reply other threads:[~2022-07-29 16:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-29 12:28 [PATCH 0/2] ci: fix the FreeBSD build Johannes Schindelin via GitGitGadget
2022-07-29 12:28 ` [PATCH 1/2] t5351: avoid relying on `core.fsyncMethod = batch` to be supported Johannes Schindelin via GitGitGadget
2022-07-29 16:07 ` Junio C Hamano [this message]
2022-07-29 21:24 ` brian m. carlson
2022-07-29 12:28 ` [PATCH 2/2] t5351: avoid using `test_cmp` for binary data Johannes Schindelin via GitGitGadget
2022-07-29 12:58 ` [PATCH 0/2] ci: fix the FreeBSD build Derrick Stolee
2022-07-29 17:51 ` Carlo Marcelo Arenas Belón
2022-07-29 16:02 ` Junio C Hamano
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=xmqq1qu3aoml.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=neerajsi@microsoft.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).