From: Zhilong Liu <zlliu@suse.com>
To: jsorensen@fb.com
Cc: linux-raid@vger.kernel.org, Zhilong Liu <zlliu@suse.com>
Subject: [PATCH 12/13] mdadm/test: did basic improvement for 05r1-n3-bitmapfile
Date: Fri, 1 Dec 2017 17:48:13 +0800 [thread overview]
Message-ID: <1512121694-18168-13-git-send-email-zlliu@suse.com> (raw)
In-Reply-To: <1512121694-18168-1-git-send-email-zlliu@suse.com>
Clean the code style.
Add sleep after add new device so that udev could
have enough time to execute.
Signed-off-by: Zhilong Liu <zlliu@suse.com>
---
tests/05r1-n3-bitmapfile | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/tests/05r1-n3-bitmapfile b/tests/05r1-n3-bitmapfile
index f1c3f1e..b7002dd 100644
--- a/tests/05r1-n3-bitmapfile
+++ b/tests/05r1-n3-bitmapfile
@@ -6,8 +6,10 @@
#
bmf=$targetdir/bitmap
rm -f $bmf
-mdadm --create -e0.90 --run $md0 --level=1 -n3 --delay=1 --bitmap $bmf $dev1 $dev2 $dev3
+mdadm --create -e0.90 --run $md0 --level=1 -n3 --delay=1 --bitmap $bmf $dev1 $dev2 $dev3
check wait
+check raid1
+check state UUU
testdev $md0 1 $mdsize0 64
mdadm -S $md0
@@ -18,8 +20,9 @@ sleep 4
dirty2=`mdadm -X $bmf | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
if [ $dirty1 -lt 400 -o $dirty2 -ne 0 ]
-then echo >&2 "ERROR bad 'dirty' counts: $dirty1 and $dirty2"
- exit 1
+then
+ echo >&2 "ERROR bad 'dirty' counts: $dirty1 and $dirty2"
+ exit 1
fi
mdadm $md0 -f $dev2
testdev $md0 1 $mdsize0 64
@@ -27,17 +30,20 @@ sleep 4
dirty3=`mdadm -X $bmf | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
if [ $dirty3 -lt 400 ]
then
- echo >&2 "ERROR dirty count $dirty3 is too small"
- exit 2
+ echo >&2 "ERROR dirty count $dirty3 is too small"
+ exit 2
fi
-
mdadm -S $md0
mdadm --assemble -R $md0 --bitmap=$bmf $dev1 $dev3
check nosync
mdadm --zero-superblock $dev2
mdadm $md0 --add $dev2
+sleep 1
check recovery
+check wait
+check raid1
+check state UUU
dirty4=`mdadm -X $bmf | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
check wait
@@ -45,9 +51,10 @@ sleep 4
dirty5=`mdadm -X $bmf | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
if [ $dirty4 -lt 400 -o $dirty5 -ne 0 ]
-then echo echo >&2 "ERROR bad 'dirty' counts at end: $dirty4 $dirty5"
- exit 1
+then
+ echo >&2 "ERROR bad 'dirty' counts at end: $dirty4 $dirty5"
+ exit 1
fi
-
mdadm -S $md0
+
exit 0
--
1.8.5.6
next prev parent reply other threads:[~2017-12-01 9:48 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-01 9:48 [RFC PATCH 00/13] mdadm/test: Basic improvement for some cases Zhilong Liu
2017-12-01 9:48 ` [PATCH 01/13] mdadm/manpage: raid10 doesn't support resize 'far' arrays Zhilong Liu
2017-12-01 9:48 ` [PATCH 02/13] mdadm/test: did basic improvement for 00names Zhilong Liu
2017-12-01 9:48 ` [PATCH 03/13] mdadm/test: redraft the 00raid1 test case Zhilong Liu
2017-12-01 9:48 ` [PATCH 04/13] mdadm/test: redraft 00raid4 " Zhilong Liu
2017-12-01 9:48 ` [PATCH 05/13] mdadm/test: redraft the 00raid5 " Zhilong Liu
2017-12-01 9:48 ` [PATCH 06/13] mdadm/test: redraft the 00raid6 " Zhilong Liu
2017-12-01 9:48 ` [PATCH 07/13] mdadm/test: redraft the 00raid10 " Zhilong Liu
2017-12-01 9:48 ` [PATCH 08/13] mdadm/test: redraft 02r5grow and rename it as 02r5grow-resize Zhilong Liu
2017-12-01 9:48 ` [PATCH 09/13] mdadm/test: redraft 02r6grow and rename it as 02r6grow-resize Zhilong Liu
2017-12-01 9:48 ` [PATCH 10/13] mdadm/test: add new test 02r10grow-resize Zhilong Liu
2017-12-01 9:48 ` [PATCH 11/13] mdadm/test: did basic improvement for 05r1-internalbitmap Zhilong Liu
2017-12-01 9:48 ` Zhilong Liu [this message]
2017-12-01 9:48 ` [PATCH 13/13] mdadm/test: Change check nosync as check recovery in 05r1-re-add-nosuper Zhilong Liu
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=1512121694-18168-13-git-send-email-zlliu@suse.com \
--to=zlliu@suse.com \
--cc=jsorensen@fb.com \
--cc=linux-raid@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).