[PATCHv2] xfs/604: Make test as _notrun for higher blocksizes filesystem

[PATCHv2] xfs/604: Make test as _notrun for higher blocksizes filesystem

[Ritesh Harjani (IBM)]

If we have filesystem with blocksize = 64k, then the falloc value will
be huge (falloc_size=5451.33GB) which makes fallocate fail hence causing
the test to fail. Instead make the testcase "_notrun" if the initial
fallocate itself fails.

Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>
---
 tests/xfs/604 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/xfs/604 b/tests/xfs/604
index bb6db797..fdc444c2 100755
--- a/tests/xfs/604
+++ b/tests/xfs/604
@@ -35,7 +35,9 @@ allocbt_node_maxrecs=$(((dbsize - alloc_block_len) / 12))
 # Create a big file with a size such that the punches below create the exact
 # free extents we want.
 num_holes=$((allocbt_leaf_maxrecs * allocbt_node_maxrecs - 1))
-$XFS_IO_PROG -c "falloc 0 $((9 * dbsize + num_holes * dbsize * 2))" -f "$SCRATCH_MNT/big"
+falloc_size=$((9 * dbsize + num_holes * dbsize * 2))
+$XFS_IO_PROG -c "falloc 0 $falloc_size" -f "$SCRATCH_MNT/big" ||
+       _notrun "Not enough space on device for falloc_size=$(echo "scale=2; $falloc_size / 1073741824" | $BC -q)GB and bs=$dbsize"
 
 # Fill in any small free extents in AG 0. After this, there should be only one,
 # large free extent.
-- 
2.43.0

Re: [PATCHv2] xfs/604: Make test as _notrun for higher blocksizes filesystem

[Darrick J. Wong]

On Mon, Jan 22, 2024 at 01:51:20PM +0530, Ritesh Harjani (IBM) wrote:
> If we have filesystem with blocksize = 64k, then the falloc value will
> be huge (falloc_size=5451.33GB) which makes fallocate fail hence causing
> the test to fail. Instead make the testcase "_notrun" if the initial
> fallocate itself fails.
> 
> Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com>

LGTM
Reviewed-by: Darrick J. Wong <djwong@kernel.org>

--D

> ---
>  tests/xfs/604 | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/xfs/604 b/tests/xfs/604
> index bb6db797..fdc444c2 100755
> --- a/tests/xfs/604
> +++ b/tests/xfs/604
> @@ -35,7 +35,9 @@ allocbt_node_maxrecs=$(((dbsize - alloc_block_len) / 12))
>  # Create a big file with a size such that the punches below create the exact
>  # free extents we want.
>  num_holes=$((allocbt_leaf_maxrecs * allocbt_node_maxrecs - 1))
> -$XFS_IO_PROG -c "falloc 0 $((9 * dbsize + num_holes * dbsize * 2))" -f "$SCRATCH_MNT/big"
> +falloc_size=$((9 * dbsize + num_holes * dbsize * 2))
> +$XFS_IO_PROG -c "falloc 0 $falloc_size" -f "$SCRATCH_MNT/big" ||
> +       _notrun "Not enough space on device for falloc_size=$(echo "scale=2; $falloc_size / 1073741824" | $BC -q)GB and bs=$dbsize"
>  
>  # Fill in any small free extents in AG 0. After this, there should be only one,
>  # large free extent.
> -- 
> 2.43.0
> 
>