Tests: adjust for recent changes.

commit cb19a251a581fe78dcddd1d95dca4d8cb7664819
    super1: reserve  at least 2 chunks for reshape headroom.

reserved more space in a RAID5, so we need to update to array
sizes when reshaping.
Also make sure reshape tests we change the shape:  raid5->raid1
was failing and we didn't notice.

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

diff --git a/tests/07changelevelintr b/tests/07changelevelintr
index d3faf2ebb9d295c4b893888428fede63af35b713..89cfff0cf99d941a3ce3bb00513fccdc1b122d40 100644 (file)
--- a/tests/07changelevelintr
+++ b/tests/07changelevelintr
@@ -48,13 +48,13 @@ mdadm -G $md0 --layout rs --backup-file=$bu
 restart
 checkgeo md0 raid5 5 $[128*1024] 3
 
-mdadm -G $md0 --array-size 59136
+mdadm -G $md0 --array-size 58368
 mdadm -G $md0 --raid-disks 4 -c 64 --backup-file=$bu
 restart
 checkgeo md0 raid5 4 $[64*1024] 3
 
 devs="$dev0 $dev1 $dev2 $dev3"
-mdadm -G $md0 --array-size 19712
+mdadm -G $md0 --array-size 19456
 mdadm -G $md0 -n 2 -c 256 --backup-file=$bu
 restart
 checkgeo md0 raid5 2 $[256*1024] 3

diff --git a/tests/07changelevels b/tests/07changelevels
index 2d584e054b99d6858103e92d970d01d35d2c3d95..d33e007c30f576c0c3a42a2d94c5b452a356cfa5 100644 (file)
--- a/tests/07changelevels
+++ b/tests/07changelevels
@@ -59,13 +59,16 @@ dotest 3
 
 mdadm -G /dev/md0 --array-size 39936
 mdadm -G $md0 -n4 --backup-file $bu
+checkgeo md0 raid6 4 $[32*1024]
 dotest 2
 
 mdadm -G $md0 -l5 --backup-file $bu
+checkgeo md0 raid5 3 $[32*1024]
 dotest 2
 
 mdadm -G /dev/md0 --array-size 19968
 mdadm -G $md0 -n2 --backup-file $bu
+checkgeo md0 raid5 2 $[32*1024]
 dotest 1
 
 mdadm -G --level=1 $md0
@@ -79,9 +82,10 @@ dotest 3
 
 mdadm $md0 --fail $dev0
 
-mdadm -G /dev/md0 --array-size 39936
+mdadm -G /dev/md0 --array-size 37888
 mdadm -G $md0 -n4 --backup-file $bu
 dotest 2
+checkgeo md0 raid6 4 $[512*1024]
 mdadm $md0 --fail $dev4
 
 mdadm $md0 --fail $dev3
@@ -98,10 +102,12 @@ dotest 2
 mdadm -G $md0 -l5 --backup-file $bu
 dotest 2
 
-mdadm -G /dev/md0 --array-size 19968
+mdadm -G /dev/md0 --array-size 18944
 mdadm -G $md0 -n2 --backup-file $bu
 dotest 1
+checkgeo md0 raid5 2 $[512*1024]
 mdadm $md0 --fail $dev2
 
 mdadm -G --level=1 $md0
 dotest 1
+checkgeo md0 raid1 2