From: Josef Bacik <jbacik@fusionio.com> To: <linux-btrfs@vger.kernel.org>, <xfs@oss.sgi.com> Subject: [PATCH 3/8] xfstests: stat the dev we're removing to make sure its' really gone V2 Date: Fri, 18 Oct 2013 14:26:25 -0400 [thread overview] Message-ID: <1382120790-31060-3-git-send-email-jbacik@fusionio.com> (raw) In-Reply-To: <1382120790-31060-1-git-send-email-jbacik@fusionio.com> 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. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> --- V1->V2: Take Eric's suggestion to do this in the helper function common/rc | 9 +++++++++ tests/btrfs/003 | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index b253948..253bd05 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() { + local h=$1 + local disk=$2 + echo 1 > /sys/class/scsi_device/${1}/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 262b1d5..15c2cc7 100755 --- a/tests/btrfs/003 +++ b/tests/btrfs/003 @@ -142,7 +142,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 \ -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Josef Bacik <jbacik@fusionio.com> To: linux-btrfs@vger.kernel.org, xfs@oss.sgi.com Subject: [PATCH 3/8] xfstests: stat the dev we're removing to make sure its' really gone V2 Date: Fri, 18 Oct 2013 14:26:25 -0400 [thread overview] Message-ID: <1382120790-31060-3-git-send-email-jbacik@fusionio.com> (raw) In-Reply-To: <1382120790-31060-1-git-send-email-jbacik@fusionio.com> 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. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> --- V1->V2: Take Eric's suggestion to do this in the helper function common/rc | 9 +++++++++ tests/btrfs/003 | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index b253948..253bd05 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() { + local h=$1 + local disk=$2 + echo 1 > /sys/class/scsi_device/${1}/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 262b1d5..15c2cc7 100755 --- a/tests/btrfs/003 +++ b/tests/btrfs/003 @@ -142,7 +142,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 \ -- 1.8.3.1 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-10-18 18:26 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-10-18 18:26 [PATCH 1/8] xfstests: fix btrfs/002 to not use the scratch dev pool Josef Bacik 2013-10-18 18:26 ` Josef Bacik 2013-10-18 18:26 ` [PATCH 2/8] xfstests: add regression test for kernel bz 60673 Josef Bacik 2013-10-18 18:26 ` Josef Bacik 2013-10-21 15:03 ` Eric Sandeen 2013-10-21 15:03 ` Eric Sandeen 2013-10-21 15:09 ` Josef Bacik 2013-10-21 15:09 ` Josef Bacik 2013-10-21 15:14 ` Eric Sandeen 2013-10-21 15:14 ` Eric Sandeen 2013-10-21 15:21 ` Eric Sandeen 2013-10-21 15:21 ` Eric Sandeen 2013-10-18 18:26 ` Josef Bacik [this message] 2013-10-18 18:26 ` [PATCH 3/8] xfstests: stat the dev we're removing to make sure its' really gone V2 Josef Bacik 2013-10-21 15:07 ` Eric Sandeen 2013-10-21 15:07 ` Eric Sandeen 2013-10-21 15:10 ` Josef Bacik 2013-10-21 15:10 ` Josef Bacik 2013-10-18 18:26 ` [PATCH 4/8] xfstests: btrfs/016: a hole punching send test Josef Bacik 2013-10-18 18:26 ` Josef Bacik 2013-10-21 15:22 ` Eric Sandeen 2013-10-21 15:22 ` Eric Sandeen 2013-10-22 21:02 ` Rich Johnston 2013-10-22 21:02 ` Rich Johnston 2013-10-18 18:26 ` [PATCH 5/8] xfstests: generic/274 increase scratch fs size to 2g Josef Bacik 2013-10-18 18:26 ` Josef Bacik 2013-10-21 15:29 ` Eric Sandeen 2013-10-21 15:29 ` Eric Sandeen 2013-10-22 20:25 ` Rich Johnston 2013-10-22 20:25 ` Rich Johnston 2013-10-18 18:26 ` [PATCH 6/8] xfstests: generic/311: add a few more test cases Josef Bacik 2013-10-18 18:26 ` Josef Bacik 2013-10-21 15:37 ` Eric Sandeen 2013-10-21 15:37 ` Eric Sandeen 2013-10-18 18:26 ` [PATCH 7/8] xfstests: btrfs/017: add a regression test for snapshot creation Josef Bacik 2013-10-18 18:26 ` Josef Bacik 2013-10-22 21:06 ` Rich Johnston 2013-10-22 21:06 ` Rich Johnston 2013-10-18 18:26 ` [PATCH 8/8] xfstests: btrfs/018: a regression test for subvolume rename Josef Bacik 2013-10-18 18:26 ` Josef Bacik 2013-10-21 15:38 ` Eric Sandeen 2013-10-21 15:38 ` Eric Sandeen 2013-10-22 21:09 ` Rich Johnston 2013-10-22 21:09 ` Rich Johnston 2013-10-22 20:57 ` [PATCH 1/8] xfstests: fix btrfs/002 to not use the scratch dev pool Rich Johnston 2013-10-22 20:57 ` Rich Johnston
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1382120790-31060-3-git-send-email-jbacik@fusionio.com \ --to=jbacik@fusionio.com \ --cc=linux-btrfs@vger.kernel.org \ --cc=xfs@oss.sgi.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.