summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2015-07-16 09:27:58 +1000
committerNeilBrown <neilb@suse.de>2015-07-16 10:50:40 +1000
commit0832fb09d91515ced206f5459f0015492b4cc10c (patch)
treea9754d05d42d649fc0b58dc4f7c13d98a5699b25
parent7cb2815a15ea3191274ebef11243a18182e014d8 (diff)
downloadmdadm-0832fb09d91515ced206f5459f0015492b4cc10c.tar.gz
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>
-rwxr-xr-xtest2
-rw-r--r--tests/07revert-inplace6
2 files changed, 4 insertions, 4 deletions
diff --git a/test b/test
index d09f3d8..cec057c 100755
--- 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 48416c8..a73eb97 100644
--- 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