Monitor/check_array: Centralize exit path

[thirdparty/mdadm.git] / tests / 05r1-re-add

diff --git a/tests/05r1-re-add b/tests/05r1-re-add
index 97db6c5a60b4ef1bed047b00e464907b731a176c..fa6bbcb421e5421f211241f7f36a75d82a0762bd 100644 (file)
--- a/tests/05r1-re-add
+++ b/tests/05r1-re-add
@@ -5,10 +5,10 @@
 # Then do some IO first.  Resync should still be very fast
 #
 
-mdadm -CR $md0 -l1 -n2 -binternal -d1 $dev1 $dev2
+mdadm -CR $md0 -l1 -n2 -binternal --bitmap-chunk=4 -d1 $dev1 $dev2
 check resync
 check wait
-testdev $md0 1 $mdsize1 1
+testdev $md0 1 $mdsize1a 64
 sleep 4
 
 mdadm $md0 -f $dev2
@@ -21,16 +21,19 @@ check nosync
 mdadm $md0 -f $dev2
 sleep 1
 mdadm $md0 -r $dev2
-testdev $md0 1 $mdsize1 1
+testdev $md0 1 $mdsize1a 64
 mdadm $md0 -a $dev2
 check wait
-cmp --ignore-initial=$[16*512] --bytes=$[$mdsize0*1024] $dev1 $dev2
+blockdev --flushbufs $dev1 $dev2
+cmp --ignore-initial=$[64*512] --bytes=$[$mdsize0*1024] $dev1 $dev2
 
 mdadm $md0 -f $dev2; sleep 1
 mdadm $md0 -r $dev2
 if dd if=/dev/zero of=$md0 ; then : ; fi
+blockdev --flushbufs $md0 # ensure writes have been sent.
 mdadm $md0 -a $dev2
 check recovery
 check wait
-cmp --ignore-initial=$[16*512] --bytes=$[$mdsize0*1024] $dev1 $dev2
+blockdev --flushbufs $dev1 $dev2
+cmp --ignore-initial=$[64*512] --bytes=$[$mdsize0*1024] $dev1 $dev2
 mdadm -S $md0