From: Anand Jain <anand.jain@oracle.com>
To: fstests@vger.kernel.org
Cc: linux-btrfs@vger.kernel.org, Anand Jain <anand.jain@oracle.com>
Subject: [PATCH 3/6] fstests: btrfs: 027 make use of new device get and put helper functions
Date: Tue, 17 May 2016 22:32:07 +0800 [thread overview]
Message-ID: <1463495530-425-3-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1463495530-425-1-git-send-email-anand.jain@oracle.com>
Below patches added helper function to get the requested
number of devices for scratch and spare device
fstest: btrfs: add functions to get and put a device for replace target
fstests: btrfs: add functions to set and reset required number of SCRATCH_DEV_POOL
This patch makes use of them.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
tests/btrfs/027 | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/tests/btrfs/027 b/tests/btrfs/027
index f0844a14f8e6..905dc0ebaa27 100755
--- a/tests/btrfs/027
+++ b/tests/btrfs/027
@@ -57,17 +57,22 @@ _require_command "$WIPEFS_PROG" wipefs
run_test()
{
local mkfs_opts=$1
- local saved_scratch_dev_pool=$SCRATCH_DEV_POOL
- local replace_dev=`echo $SCRATCH_DEV_POOL | awk '{print $NF}'`
+ local ndevs=`echo $SCRATCH_DEV_POOL | wc -w`
+
+ # reserve one for replace target
+ ((ndevs--))
+
+ _scratch_dev_pool_get $ndevs
+ _spare_dev_get
echo "Test $mkfs_opts" >>$seqres.full
- SCRATCH_DEV_POOL=`echo $SCRATCH_DEV_POOL | sed -e "s# *$replace_dev *##"`
_scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1
# make sure we created btrfs with desired options
if [ $? -ne 0 ]; then
echo "mkfs $mkfs_opts failed"
- SCRATCH_DEV_POOL=$saved_scratch_dev_pool
+ _spare_dev_put
+ _scratch_dev_pool_put
return
fi
_scratch_mount >>$seqres.full 2>&1
@@ -89,17 +94,19 @@ run_test()
_scratch_mount -o degraded >>$seqres.full 2>&1
# replace $missing_dev with $replace_dev and scrub it to double-check
- $BTRFS_UTIL_PROG replace start -B -r $missing_dev_id $replace_dev \
+ $BTRFS_UTIL_PROG replace start -B -r $missing_dev_id $SPARE_DEV \
$SCRATCH_MNT -f >>$seqres.full 2>&1
if [ $? -ne 0 ]; then
echo "btrfs replace failed"
- SCRATCH_DEV_POOL=$saved_scratch_dev_pool
+ _spare_dev_put
+ _scratch_dev_pool_put
return
fi
$BTRFS_UTIL_PROG scrub start -B $SCRATCH_MNT >>$seqres.full 2>&1
if [ $? -ne 0 ]; then
echo "btrfs scrub failed"
- SCRATCH_DEV_POOL=$saved_scratch_dev_pool
+ _spare_dev_put
+ _scratch_dev_pool_put
return
fi
@@ -107,7 +114,8 @@ run_test()
# we called _require_scratch_nocheck instead of _require_scratch
# do check after test for each profile config
_check_scratch_fs
- SCRATCH_DEV_POOL=$saved_scratch_dev_pool
+ _spare_dev_put
+ _scratch_dev_pool_put
}
echo "Silence is golden"
--
2.7.0
next prev parent reply other threads:[~2016-05-17 14:32 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-17 14:32 [PATCH 1/6] fstests: btrfs: add functions to set and reset required number of SCRATCH_DEV_POOL Anand Jain
2016-05-17 14:32 ` [PATCH 2/6] fstests: btrfs: add functions to get and put a device for replace target Anand Jain
2016-06-12 4:42 ` Eryu Guan
2016-06-15 8:45 ` Anand Jain
2016-06-15 8:47 ` [PATCH v2 " Anand Jain
2016-05-17 14:32 ` Anand Jain [this message]
2016-05-17 14:32 ` [PATCH 4/6] fstests: btrfs: add helper function to check if btrfs is module Anand Jain
2016-06-12 4:53 ` Eryu Guan
2016-06-15 8:45 ` Anand Jain
2016-06-15 8:47 ` [PATCH v2 " Anand Jain
2016-05-17 14:32 ` [PATCH 5/6] fstests: btrfs: test RAID1 device reappear and balanced Anand Jain
2016-06-12 5:06 ` Eryu Guan
2016-06-15 8:45 ` Anand Jain
2016-06-15 8:48 ` [PATCH v2 " Anand Jain
2016-06-21 13:31 ` Eryu Guan
2016-06-22 11:01 ` Anand Jain
2016-06-27 9:29 ` Eryu Guan
2016-06-30 11:04 ` Anand Jain
2016-06-30 14:58 ` Eryu Guan
2016-06-23 13:28 ` [PATCH v3 2/6] fstests: btrfs: add functions to get and put a device for replace target Anand Jain
2016-06-30 10:58 ` [PATCH v3 5/6] fstests: btrfs: test RAID1 device reappear and balanced Anand Jain
2016-05-17 14:32 ` [PATCH 6/6] fstests: btrfs: test RAID5 device reappear and balance Anand Jain
2016-06-12 5:08 ` Eryu Guan
2016-06-15 8:51 ` Anand Jain
2016-06-15 8:49 ` [PATCH v2 " Anand Jain
2016-06-30 10:59 ` [PATCH v3 " Anand Jain
2016-06-12 4:40 ` [PATCH 1/6] fstests: btrfs: add functions to set and reset required number of SCRATCH_DEV_POOL Eryu Guan
2016-06-15 8:44 ` Anand Jain
2016-06-15 8:46 ` [PATCH v2 " Anand Jain
2016-06-21 13:20 ` Eryu Guan
2016-06-22 11:01 ` Anand Jain
2016-06-23 13:25 ` [PATCH v3 " Anand Jain
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=1463495530-425-3-git-send-email-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=fstests@vger.kernel.org \
--cc=linux-btrfs@vger.kernel.org \
/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: link
Be 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.