[PATCH] xfs/073: avoid large recurise diff

[PATCH] xfs/073: avoid large recurise diff

[Christoph Hellwig]

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>
---
 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)
 
 	echo comparing new image directories to old
 	find $source_dir | _filter_path $source_dir > $tmp.manifest1
-- 
2.43.0

Re: [PATCH] xfs/073: avoid large recurise diff

[Darrick J. Wong]

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
> 
> 

Re: [PATCH] xfs/073: avoid large recurise diff

[Christoph Hellwig]

Looking at the reply I noticed I misspelled recursive in the subject,
so maybe this can get fixed up when applying the patch?

Re: [PATCH] xfs/073: avoid large recurise diff

[Zorro Lang]

On Fri, Jun 21, 2024 at 07:04:16AM +0200, Christoph Hellwig wrote:
> Looking at the reply I noticed I misspelled recursive in the subject,
> so maybe this can get fixed up when applying the patch?

Sure, I've noticed that and have changed it in my local branch :)

Thanks,
Zorro

> 
>