diff mbox series

btrfs/058: fix test to actually have an open tmpfile during the send operation

Message ID f2f3902ab7603f82751a9729cc8f1b406c5cbf98.1742386250.git.fdmanana@suse.com (mailing list archive)
State New
Headers show
Series btrfs/058: fix test to actually have an open tmpfile during the send operation | expand

Commit Message

Filipe Manana March 19, 2025, 12:13 p.m. UTC 
From: Filipe Manana <fdmanana@suse.com>

The test's goal is to exercise a send operation while there's a tmpfile in
the snapshot, but that doesn't happen since the background xfs_io process
that created the tmpfile ends up exiting before we create the snapshot, so
the snapshot nevers gets a tmpfile.

Fix this by using a different approach, with a fifo and tailing it to the
stdin of a background xfs_io process and then writing to the fifo to
create the tmpfile. This keeps the xfs_io process running with the tmpfile
open while we snapshot and run the send operation.

While at it also add code to verify we have the tmpfile (an orphan inode
item) in the snapshot's tree.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
 tests/btrfs/058 | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

Comments

Anand Jain March 25, 2025, 9:03 a.m. UTC | #1 
On 19/3/25 20:13, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
> 
> The test's goal is to exercise a send operation while there's a tmpfile in
> the snapshot, but that doesn't happen since the background xfs_io process
> that created the tmpfile ends up exiting before we create the snapshot, so
> the snapshot nevers gets a tmpfile.
> 
> Fix this by using a different approach, with a fifo and tailing it to the
> stdin of a background xfs_io process and then writing to the fifo to
> create the tmpfile. This keeps the xfs_io process running with the tmpfile
> open while we snapshot and run the send operation.
> 
> While at it also add code to verify we have the tmpfile (an orphan inode
> item) in the snapshot's tree.
> 
> Signed-off-by: Filipe Manana <fdmanana@suse.com>

Reviewed-by: Anand Jain <anand.jain@oracle.com>

Applied to for-next.

Thx.
Anand

> ---
>   tests/btrfs/058 | 28 ++++++++++++++++++++++++----
>   1 file changed, 24 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/btrfs/058 b/tests/btrfs/058
> index 7bc4af5b..3bb0ed21 100755
> --- a/tests/btrfs/058
> +++ b/tests/btrfs/058
> @@ -21,6 +21,7 @@ _cleanup()
>   {
>   	if [ ! -z $XFS_IO_PID ]; then
>   		kill $XFS_IO_PID > /dev/null 2>&1
> +		wait
>   	fi
>   	rm -fr $tmp
>   }
> @@ -29,18 +30,22 @@ _cleanup()
>   
>   _require_scratch
>   _require_xfs_io_command "-T"
> +_require_mknod
> +_require_btrfs_command inspect-internal dump-tree
>   
>   _scratch_mkfs >/dev/null 2>&1
>   _scratch_mount
>   
> +mkfifo $SCRATCH_MNT/fifo
> +
>   # Create a tmpfile file, write some data to it and leave it open, so that our
>   # main subvolume has an orphan inode item.
> -$XFS_IO_PROG -T $SCRATCH_MNT >>$seqres.full 2>&1 < <(
> -	echo "pwrite 0 65536"
> -	read
> -) &
> +tail -f $SCRATCH_MNT/fifo | $XFS_IO_PROG >>$seqres.full &
>   XFS_IO_PID=$!
>   
> +echo "open -T $SCRATCH_MNT" > $SCRATCH_MNT/fifo
> +echo "pwrite 0 64K" > $SCRATCH_MNT/fifo
> +
>   # Give it some time to the xfs_io process to create the tmpfile.
>   sleep 3
>   
> @@ -48,6 +53,21 @@ sleep 3
>   # The send operation used to fail with -ESTALE due to the presence of the
>   # orphan inode.
>   _btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap
> +
> +snap_id=$(_btrfs_get_subvolid $SCRATCH_MNT mysnap)
> +# Inode numbers are sequential, so our tmpfile's inode number is the number of
> +# the fifo's inode plus 1.
> +ino=$(( $(stat -c %i $SCRATCH_MNT/fifo) + 1 ))
> +
> +# Verify that we indeed have the tmpfile in the snapshot tree.
> +$BTRFS_UTIL_PROG inspect-internal dump-tree -t $snap_id $SCRATCH_DEV | \
> +	grep -q "(ORPHAN ORPHAN_ITEM $ino)"
> +if [ $? -ne 0 ]; then
> +	echo "orphan item for tmpfile not found in the snapshot tree!"
> +	echo -e "snapshot tree dump is:\n"
> +	$BTRFS_UTIL_PROG inspect-internal dump-tree -t $snap_id $SCRATCH_DEV
> +fi
> +
>   _btrfs send -f /dev/null $SCRATCH_MNT/mysnap
>   
>   status=0
diff mbox series

Patch

diff --git a/tests/btrfs/058 b/tests/btrfs/058
index 7bc4af5b..3bb0ed21 100755
--- a/tests/btrfs/058
+++ b/tests/btrfs/058
@@ -21,6 +21,7 @@  _cleanup()
 {
 	if [ ! -z $XFS_IO_PID ]; then
 		kill $XFS_IO_PID > /dev/null 2>&1
+		wait
 	fi
 	rm -fr $tmp
 }
@@ -29,18 +30,22 @@  _cleanup()
 
 _require_scratch
 _require_xfs_io_command "-T"
+_require_mknod
+_require_btrfs_command inspect-internal dump-tree
 
 _scratch_mkfs >/dev/null 2>&1
 _scratch_mount
 
+mkfifo $SCRATCH_MNT/fifo
+
 # Create a tmpfile file, write some data to it and leave it open, so that our
 # main subvolume has an orphan inode item.
-$XFS_IO_PROG -T $SCRATCH_MNT >>$seqres.full 2>&1 < <(
-	echo "pwrite 0 65536"
-	read
-) &
+tail -f $SCRATCH_MNT/fifo | $XFS_IO_PROG >>$seqres.full &
 XFS_IO_PID=$!
 
+echo "open -T $SCRATCH_MNT" > $SCRATCH_MNT/fifo
+echo "pwrite 0 64K" > $SCRATCH_MNT/fifo
+
 # Give it some time to the xfs_io process to create the tmpfile.
 sleep 3
 
@@ -48,6 +53,21 @@  sleep 3
 # The send operation used to fail with -ESTALE due to the presence of the
 # orphan inode.
 _btrfs subvolume snapshot -r $SCRATCH_MNT $SCRATCH_MNT/mysnap
+
+snap_id=$(_btrfs_get_subvolid $SCRATCH_MNT mysnap)
+# Inode numbers are sequential, so our tmpfile's inode number is the number of
+# the fifo's inode plus 1.
+ino=$(( $(stat -c %i $SCRATCH_MNT/fifo) + 1 ))
+
+# Verify that we indeed have the tmpfile in the snapshot tree.
+$BTRFS_UTIL_PROG inspect-internal dump-tree -t $snap_id $SCRATCH_DEV | \
+	grep -q "(ORPHAN ORPHAN_ITEM $ino)"
+if [ $? -ne 0 ]; then
+	echo "orphan item for tmpfile not found in the snapshot tree!"
+	echo -e "snapshot tree dump is:\n"
+	$BTRFS_UTIL_PROG inspect-internal dump-tree -t $snap_id $SCRATCH_DEV
+fi
+
 _btrfs send -f /dev/null $SCRATCH_MNT/mysnap
 
 status=0