xfs
[Top] [All Lists]

[PATCH 6/8] xfstests: generic/311: add a few more test cases

To: <linux-btrfs@xxxxxxxxxxxxxxx>, <xfs@xxxxxxxxxxx>
Subject: [PATCH 6/8] xfstests: generic/311: add a few more test cases
From: Josef Bacik <jbacik@xxxxxxxxxxxx>
Date: Fri, 18 Oct 2013 14:26:28 -0400
Delivered-to: xfs@xxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fusionio.com; s=default; t=1382120802; bh=YcH8+sPd4Vo8fqF2aLo0UZtRuVP6o2KVvlrgZ611t5s=; h=From:To:Subject:Date:In-Reply-To:References; b=Odl/bnFjTAOJt60IZbO9KgGVN1tOR6joO/zwPRgpWPI+djcLsqKAGGmsDwTovJR0S PX9EILEJpCU/DcmJLBHf2CAk42aFLkeyOA64LipJhIGLxRNw460k7nd8ZIu8swIVuN u703+h2mPscVRuckQuxZmiQwVUrGjbcIMMW5V7eU=
In-reply-to: <1382120790-31060-1-git-send-email-jbacik@xxxxxxxxxxxx>
References: <1382120790-31060-1-git-send-email-jbacik@xxxxxxxxxxxx>
Btrfs had some issues with fsync()'ing directories and fsync()'ing after
renames.  These three new tests cover the 3 different issues we were seeing.
Thanks,

Signed-off-by: Josef Bacik <jbacik@xxxxxxxxxxxx>
---
 tests/generic/311     | 89 +++++++++++++++++++++++++++++++++++++++++++++++++--
 tests/generic/311.out |  8 +++++
 2 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/tests/generic/311 b/tests/generic/311
index 675d927..002ad57 100644
--- a/tests/generic/311
+++ b/tests/generic/311
@@ -70,6 +70,8 @@ testfile=$SCRATCH_MNT/$seq.fsync
 FLAKEY_TABLE="0 $BLK_DEV_SIZE flakey $SCRATCH_DEV 0 180 0"
 FLAKEY_TABLE_DROP="0 $BLK_DEV_SIZE flakey $SCRATCH_DEV 0 0 180 1 drop_writes"
 _TEST_OPTIONS=""
+allow_writes=0
+drop_writes=1
 
 _mount_flakey()
 {
@@ -104,8 +106,6 @@ _load_flakey_table()
 _run_test()
 {
        # _run_test <testnum> <0 - buffered | 1 - O_DIRECT>
-       allow_writes=0
-       drop_writes=1
        test_num=$1
 
        direct_opt=""
@@ -131,6 +131,83 @@ _run_test()
        _mount_flakey
 }
 
+_clean_working_dir()
+{
+       _mount_flakey
+       rm -rf $SCRATCH_MNT/*
+       _unmount_flakey
+}
+
+# Btrfs wasn't making sure the directory survived fsync
+_directory_test()
+{
+       echo "fsync new directory"
+       _mount_flakey
+       mkdir $SCRATCH_MNT/bar
+       $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/bar
+       _load_flakey_table $drop_writes
+       _unmount_flakey
+
+       _load_flakey_table $allow_writes
+       _mount_flakey
+       _ls_l $SCRATCH_MNT | tail -n +2 | awk '{ print $1, $9 }'
+       _unmount_flakey
+       _check_scratch_fs $FLAKEY_DEV
+       [ $? -ne 0 ] && _fatal "fsck failed"
+}
+
+# Btrfs was losing a rename into a new directory
+_rename_test()
+{
+       echo "rename fsync test"
+       _mount_flakey
+       touch $SCRATCH_MNT/foo
+       mkdir $SCRATCH_MNT/bar
+       $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/foo
+       mv $SCRATCH_MNT/foo $SCRATCH_MNT/bar/foo
+       $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/bar
+       $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/bar/foo
+       _load_flakey_table $drop_writes
+       _unmount_flakey
+
+       _load_flakey_table $allow_writes
+       _mount_flakey
+       _ls_l $SCRATCH_MNT | tail -n +2 | awk '{ print $1, $9 }'
+       _ls_l $SCRATCH_MNT/bar | tail -n +2 | awk '{ print $1, $9 }'
+       _unmount_flakey
+       _check_scratch_fs $FLAKEY_DEV
+       [ $? -ne 0 ] && _fatal "fsck failed"
+}
+
+# Btrfs was failing to replay a log when we had a inode with a smaller inode
+# number that is renamed into a directory with a higher inode number
+_replay_rename_test()
+{
+       echo "replay rename fsync test"
+       _mount_flakey
+       touch $SCRATCH_MNT/foo
+       mkdir $SCRATCH_MNT/bar
+       $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/foo
+       mv $SCRATCH_MNT/foo $SCRATCH_MNT/bar/foo
+       $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/bar
+
+       # This is to force btrfs to relog the entire inode including the ref so
+       # we are sure to try and replay the ref along with the dir_index item
+       setfattr -n user.foo -v blah $SCRATCH_MNT/bar/foo >> $seqres.full 2>&1
+
+       $XFS_IO_PROG -c "fsync" $SCRATCH_MNT/bar/foo
+       _load_flakey_table $drop_writes
+       _unmount_flakey
+
+       _load_flakey_table $allow_writes
+       _mount_flakey
+       _ls_l $SCRATCH_MNT | tail -n +2 | awk '{ print $1, $9 }'
+       _ls_l $SCRATCH_MNT/bar | tail -n +2 | awk '{ print $1, $9 }'
+       _unmount_flakey
+       _check_scratch_fs $FLAKEY_DEV
+       [ $? -ne 0 ] && _fatal "fsck failed"
+}
+
 _scratch_mkfs >> $seqres.full 2>&1
 
 # Create a basic flakey device that will never error out
@@ -157,5 +234,13 @@ for i in $(seq 1 20); do
        _run_test $i $direct
 done
 
+rm -rf $SCRATCH_MNT/*
+_unmount_flakey
+_directory_test
+_clean_working_dir
+_rename_test
+_clean_working_dir
+_replay_rename_test
+
 status=0
 exit
diff --git a/tests/generic/311.out b/tests/generic/311.out
index 5bad6a7..8a0d5c8 100644
--- a/tests/generic/311.out
+++ b/tests/generic/311.out
@@ -319,3 +319,11 @@ Running test 20 direct, nolockfs
 Random seed is 20
 a16ac2b84456d41a15a1a4cc1202179f
 a16ac2b84456d41a15a1a4cc1202179f
+fsync new directory
+drwxr-xr-x bar
+rename fsync test
+drwxr-xr-x bar
+-rw-r--r-- foo
+replay rename fsync test
+drwxr-xr-x bar
+-rw-r--r-- foo
-- 
1.8.3.1

<Prev in Thread] Current Thread [Next in Thread>