xfstests: stat the dev we're removing to make sure its' really gone

I've been periodically failing btrfs/003 because my box sometimes takes a little
longer to unregister the device when we remove it and so the output from btrfs
dev show doesn't match what we are wanting since it still sees the device.  To
fix this just stat and sleep if we still see the device node and only continue
once udev or whatever actually removes the device node so that we don't get
random failures.

Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Josef Bacik
2013-10-21 16:13:53 +00:00
committed by Rich Johnston
parent 0c6fb9f3ac
commit 22ebe35719
2 changed files with 11 additions and 2 deletions
+10 -1
View File
@@ -2093,7 +2093,16 @@ _require_freeze()
# ls -l /sys/class/block/sdd | rev | cut -d "/" -f 3 | rev # ls -l /sys/class/block/sdd | rev | cut -d "/" -f 3 | rev
_devmgt_remove() _devmgt_remove()
{ {
echo 1 > /sys/class/scsi_device/${1}/device/delete || _fail "Remove disk failed" local lun=$1
local disk=$2
echo 1 > /sys/class/scsi_device/${lun}/device/delete || _fail "Remove disk failed"
stat $disk > /dev/null 2>&1
while [ $? -eq 0 ]; do
sleep 1
stat $disk > /dev/null 2>&1
done
} }
# arg 1 is dev to add and is output of the below eg. # arg 1 is dev to add and is output of the below eg.
+1 -1
View File
@@ -145,7 +145,7 @@ _test_replace()
DEVHTL=`ls -l /sys/class/block/${d} | rev | cut -d "/" -f 3 | rev` DEVHTL=`ls -l /sys/class/block/${d} | rev | cut -d "/" -f 3 | rev`
#fail disk #fail disk
_devmgt_remove ${DEVHTL} _devmgt_remove ${DEVHTL} $ds
dev_removed=1 dev_removed=1
$BTRFS_UTIL_PROG fi show $SCRATCH_DEV | grep "Some devices missing" >> $seqres.full || _fail \ $BTRFS_UTIL_PROG fi show $SCRATCH_DEV | grep "Some devices missing" >> $seqres.full || _fail \