From 4108d695e37adc11bdf3be1b1f1e4710052d5339 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 23 Jul 2015 11:09:19 +1000 Subject: [PATCH] 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 --- tests/05r1-re-add | 1 + tests/05r1-re-add-nosuper | 1 + 2 files changed, 2 insertions(+) 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