From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: zlang@kernel.org, linux-xfs@vger.kernel.org, fstests@vger.kernel.org
Subject: Re: [PATCH] xfs/073: avoid large recurise diff
Date: Thu, 20 Jun 2024 08:23:06 -0700 [thread overview]
Message-ID: <20240620152306.GV103034@frogsfrogsfrogs> (raw)
In-Reply-To: <20240620124844.558637-1-hch@lst.de>
On Thu, Jun 20, 2024 at 02:48:44PM +0200, Christoph Hellwig wrote:
> xfs/073 has been failing for me for a while on most of my test setups
> with:
>
> diff: memory exhausted
>
> from the large recursive diff it does. Replace that with a pipe using
> md5sum to reduce the memory usage.
>
> Based on a snipplet from Darrick Wong.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
LGTM
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
> ---
> tests/xfs/073 | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tests/xfs/073 b/tests/xfs/073
> index c7616b9e9..0f96fdb09 100755
> --- a/tests/xfs/073
> +++ b/tests/xfs/073
> @@ -76,7 +76,8 @@ _verify_copy()
> fi
>
> echo comparing new image files to old
> - diff -Naur $source_dir $target_dir
> + (cd $source_dir; find . -type f -print0 | xargs -0 md5sum) | \
> + (cd $target_dir ; md5sum -c --quiet)
Dumb nit: shellcheck ^^ tells me these semicolons should be a '&&' so
that the find/md5sum won't run if the cd fails, but the incorrect file
list and whatever error messages cd coughs up will be enough to fail the
test anyway.
--D
>
> echo comparing new image directories to old
> find $source_dir | _filter_path $source_dir > $tmp.manifest1
> --
> 2.43.0
>
>
next prev parent reply other threads:[~2024-06-20 15:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 12:48 [PATCH] xfs/073: avoid large recurise diff Christoph Hellwig
2024-06-20 15:23 ` Darrick J. Wong [this message]
2024-06-21 5:04 ` Christoph Hellwig
2024-06-21 15:51 ` Zorro Lang
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=20240620152306.GV103034@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
--cc=zlang@kernel.org \
/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