]> git.apps.os.sepia.ceph.com Git - xfstests-dev.git/commit
btrfs: 'subvolume stress' tasks need to exit gracefully
authorChandan Rajendra <chandan@linux.vnet.ibm.com>
Wed, 23 Mar 2016 06:39:11 +0000 (17:39 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 23 Mar 2016 06:39:11 +0000 (17:39 +1100)
commit1ffa40385a741dff38cde3e01c9eaa1e938f72ce
tree5a538a22c9504e2eaf28bc4404fbe5b7557514ae
parent5af5146ef16c7996ee096b8f6190335c48f00658
btrfs: 'subvolume stress' tasks need to exit gracefully

The following scenario can occur when running btrfs/066,

  Task A                                Task B                     Task C

  run_test()
  - Execute _btrfs_stress_subvolume()
    in a background shell.
                                        _btrfs_stress_subvolme()
                                          ...
                                        - fork & exec "mount"
                                                          Mount subvolume on directory in $TEST_DIR
  - Wait for fsstress to finish                                    do_mount()
  - kill shell process executing                                   - btrfs_mount()
    _btrfs_stress_subvolume()
    i.e. Task B.
  - Init process becomes the parent
    of "subvolume mount" task
    i.e. Task C.
  - In case subvolume is mounted
    (which is not the case),
    unmount it.
                                                                   - Complete mounting subvolume

Hence on the completion of one iteration of run_test(), the subvolume
created inside the filesystem on $SCRATCH_DEV continues to be mounted on
$TEST_DIR/$seq.mnt. Subsequent invocations of run_test() (called for
remaining Btrfs profile configs) fail during _scratch_pool_mkfs.

Instead of killing the 'subvolume stress' task this commit makes
_btrfs_stress_subvolume() to break out of the loop when a file exists
on the filesystem. The commit also makes relevant changes to other
users of _btrfs_stress_subvolume() i.e. btrfs/060, btrfs/065,
btrfs/067 & btrfs/068.

Suggested-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
common/rc
tests/btrfs/060
tests/btrfs/065
tests/btrfs/066
tests/btrfs/067
tests/btrfs/068