summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2015-07-23 11:09:19 +1000
committerNeilBrown <neilb@suse.com>2015-07-23 11:09:19 +1000
commit4108d695e37adc11bdf3be1b1f1e4710052d5339 (patch)
tree0a048ea0fec73b6ffe03d200c11db56018b78a3b
parentd51e39c0a42c799088b39d16ede01f95345d7675 (diff)
downloadmdadm-4108d695e37adc11bdf3be1b1f1e4710052d5339.tar.gz
tests: flushbufs after writing zeros
sometimes the removed device is re-added before the writes get all the way to the md device - so the array doesn't need any recovery and the test fails. So flush first to be safe. Signed-off-by: NeilBrown <neilb@suse.com>
-rw-r--r--tests/05r1-re-add1
-rw-r--r--tests/05r1-re-add-nosuper1
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/05r1-re-add b/tests/05r1-re-add
index 3da1a4a..fa6bbcb 100644
--- a/tests/05r1-re-add
+++ b/tests/05r1-re-add
@@ -30,6 +30,7 @@ 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
diff --git a/tests/05r1-re-add-nosuper b/tests/05r1-re-add-nosuper
index 8025a68..058d602 100644
--- a/tests/05r1-re-add-nosuper
+++ b/tests/05r1-re-add-nosuper
@@ -29,6 +29,7 @@ cmp --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 # make sure writes have been sent
mdadm $md0 --re-add $dev2
check recovery
check wait