tests: slow down --stop a bit to allow revert-inplace to work.

revert-inplace would sometimes find that the original reshape had
finished.
So slow down the reshaping during --stop (which needs to be a little
bit fast so that stop doesn't timeout waiting) and don't wait quite
so long before stopping.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/test b/test
index d09f3d8feca29ce8b5105953f9750dc5e2b1a929..cec057c2d8c8811882936226559e4155b71eb484 100755 (executable)
--- a/test
+++ b/test
@@ -156,7 +156,7 @@ mdadm() {
     case $* in
        *-S* ) udevadm settle
               p=`cat /proc/sys/dev/raid/speed_limit_max`
-              echo 2000000 > /proc/sys/dev/raid/speed_limit_max
+              echo 20000 > /proc/sys/dev/raid/speed_limit_max
     esac
     case $* in
        *-C* ) $mdadm 2> $targetdir/stderr --quiet "$@" --auto=yes;;

diff --git a/tests/07revert-inplace b/tests/07revert-inplace
index 48416c8f3ff4e3e96beaed99d9b32304a1b7aab9..a73eb977374d28f4342b7d1472e54a45813f0b1d 100644 (file)
--- a/tests/07revert-inplace
+++ b/tests/07revert-inplace
@@ -8,7 +8,7 @@ mdadm -CR --assume-clean $md0 -l5 -n4 -x1 $devlist4
 check raid5
 testdev $md0 3 $mdsize1 512
 mdadm -G $md0 -l 6
-sleep 3
+sleep 2
 mdadm -S $md0
 mdadm -A $md0 --update=revert-reshape $devlist4 --backup-file=/tmp/md-backup
 check wait
@@ -22,7 +22,7 @@ mdadm -CR --assume-clean $md0 -l6 -n5 $devlist4
 check raid6
 testdev $md0 3 $mdsize1 512
 mdadm -G $md0 -l 5
-sleep 3
+sleep 2
 mdadm -S $md0
 mdadm -A $md0 --update=revert-reshape $devlist4 --backup-file=/tmp/md-backup
 check wait
@@ -35,7 +35,7 @@ mdadm -CR --assume-clean $md0 -l10 -n6 -c 64 $devlist5
 check raid10
 testdev $md0 3 $mdsize1 64
 mdadm -G $md0 -c 32
-sleep 3
+sleep 2
 mdadm -S $md0
 strace -o /tmp/str ./mdadm -A $md0 --update=revert-reshape $devlist5
 check wait