From 22ebe357198ea2519af6fd7e9082b9ac432631de Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Mon, 21 Oct 2013 16:13:53 +0000 Subject: [PATCH] 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 Reviewed-by: Eric Sandeen Signed-off-by: Rich Johnston --- common/rc | 11 ++++++++++- tests/btrfs/003 | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/common/rc b/common/rc index b2539487..b5eb5826 100644 --- a/common/rc +++ b/common/rc @@ -2093,7 +2093,16 @@ _require_freeze() # ls -l /sys/class/block/sdd | rev | cut -d "/" -f 3 | rev _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. diff --git a/tests/btrfs/003 b/tests/btrfs/003 index 97938d27..9105d064 100755 --- a/tests/btrfs/003 +++ b/tests/btrfs/003 @@ -145,7 +145,7 @@ _test_replace() DEVHTL=`ls -l /sys/class/block/${d} | rev | cut -d "/" -f 3 | rev` #fail disk - _devmgt_remove ${DEVHTL} + _devmgt_remove ${DEVHTL} $ds dev_removed=1 $BTRFS_UTIL_PROG fi show $SCRATCH_DEV | grep "Some devices missing" >> $seqres.full || _fail \ -- 2.39.5