tests: fix raid0 tests for 0.90 metadata

Some of the test cases fail because raid0 creation fails with the error,
"0.90 metadata does not support layouts for RAID0" added by commit,
329dfc28debb. Fix some of the test cases by switching from raid0 to
linear level for 0.9 metadata where possible.

Signed-off-by: Sudhakar Panneerselvam <sudhakar.panneerselvam@oracle.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>

diff --git a/tests/00raid0 b/tests/00raid0
index e6b21cc419eb5d62694b3a1ff6bf068de8357087..9b8896cbdc52ff58ab58158dee42ae4bb6a03e0b 100644 (file)
--- a/tests/00raid0
+++ b/tests/00raid0
@@ -20,8 +20,8 @@ mdadm -S $md0
 # now same again with different chunk size
 for chunk in 4 32 256
 do
-  mdadm -CR $md0 -e0.90 -l raid0 --chunk $chunk -n3 $dev0 $dev1 $dev2
-  check raid0
+  mdadm -CR $md0 -e0.90 -l linear --chunk $chunk -n3 $dev0 $dev1 $dev2
+  check linear
   testdev $md0 3 $mdsize0 $chunk
   mdadm -S $md0
 

diff --git a/tests/00readonly b/tests/00readonly
index 28b0fa13f8155acbe8cc83fc67e998b28fba52e9..39202487f61498f61e1e71b754e53c70325551a6 100644 (file)
--- a/tests/00readonly
+++ b/tests/00readonly
@@ -4,6 +4,10 @@ for metadata in 0.9 1.0 1.1 1.2
 do
        for level in linear raid0 raid1 raid4 raid5 raid6 raid10
        do
+               if [[ $metadata == "0.9" && $level == "raid0" ]];
+               then
+                       continue
+               fi
                mdadm -CR $md0 -l $level -n 4 --metadata=$metadata \
                        $dev1 $dev2 $dev3 $dev4 --assume-clean
                check nosync

diff --git a/tests/03r0assem b/tests/03r0assem
index 6744e3221062943989a2a74817c88e8de90d6ca0..44df064562330736f4e9adf3cd2eaeb95c09e2e5 100644 (file)
--- a/tests/03r0assem
+++ b/tests/03r0assem
@@ -68,9 +68,9 @@ mdadm -S $md2
 ### Now for version 0...
 
 mdadm --zero-superblock $dev0 $dev1 $dev2
-mdadm -CR $md2 -l0 --metadata=0.90 -n3 $dev0 $dev1 $dev2
-check raid0
-tst="testdev $md2 3 $mdsize0 512"
+mdadm -CR $md2 -llinear --metadata=0.90 -n3 $dev0 $dev1 $dev2
+check linear
+tst="testdev $md2 3 $mdsize0 1"
 $tst
 
 uuid=`mdadm -Db $md2 | sed 's/.*UUID=//'`

diff --git a/tests/04r0update b/tests/04r0update
index 73ee3b9fed918de030149f9a836ac469a696eefe..b95efb06c761b76857909d58326bd32878907628 100644 (file)
--- a/tests/04r0update
+++ b/tests/04r0update
@@ -1,7 +1,7 @@
 
 # create a raid0, re-assemble with a different super-minor
-mdadm -CR -e 0.90 $md0 -l0 -n3 $dev0 $dev1 $dev2
-testdev $md0 3 $mdsize0 512
+mdadm -CR -e 0.90 $md0 -llinear -n3 $dev0 $dev1 $dev2
+testdev $md0 3 $mdsize0 1
 minor1=`mdadm -E $dev0 | sed -n -e 's/.*Preferred Minor : //p'`
 mdadm -S /dev/md0
 

diff --git a/tests/04update-metadata b/tests/04update-metadata
index 232fc1ffff4be7babad8c54bb76165b4a5099fba..08c14af7ed29b03d22f7c53af0010aa3d7fb3dc6 100644 (file)
--- a/tests/04update-metadata
+++ b/tests/04update-metadata
@@ -8,7 +8,7 @@ set -xe
 
 dlist="$dev0 $dev1 $dev2 $dev3"
 
-for ls in raid0/4 linear/4 raid1/1 raid5/3 raid6/2
+for ls in linear/4 raid1/1 raid5/3 raid6/2
 do
   s=${ls#*/} l=${ls%/*}
   mdadm -CR --assume-clean -e 0.90 $md0 --level $l -n 4 -c 64 $dlist