tests: raid6 repair is now tested on every different layout.

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

diff --git a/tests/19raid6auto-repair b/tests/19raid6auto-repair
index 7fb1c72f811d650ec1db006002c6dce7858743fc..ce4a7c08ef9a02c1ea0aefd43609801e72a6726e 100644 (file)
--- a/tests/19raid6auto-repair
+++ b/tests/19raid6auto-repair
@@ -10,32 +10,40 @@ data_offset_in_kib=$[2048/2]
 
 # make a raid5 from a file
 dd if=/dev/urandom of=/tmp/RandFile bs=1024 count=$array_data_size_in_kib
-mdadm -CR $md0 -l6 -n$number_of_disks -c $chunksize_in_kib $devs
-dd if=/tmp/RandFile of=$md0 bs=1024 count=$array_data_size_in_kib
-blockdev --flushbufs $md0; sync
-check wait
-blockdev --flushbufs $devs; sync
-echo 3 > /proc/sys/vm/drop_caches
-cmp -s -n $array_data_size_in_b $md0 /tmp/RandFile || { echo sanity cmp failed ; exit 2; }
-
-# wipe out 5 chunks on each device
-dd if=/dev/urandom of=$dev0 bs=1024 count=$[5*chunksize_in_kib] seek=$[data_offset_in_kib+chunksize_in_kib*0]
-dd if=/dev/urandom of=$dev1 bs=1024 count=$[5*chunksize_in_kib] seek=$[data_offset_in_kib+chunksize_in_kib*5]
-dd if=/dev/urandom of=$dev2 bs=1024 count=$[5*chunksize_in_kib] seek=$[data_offset_in_kib+chunksize_in_kib*10]
-dd if=/dev/urandom of=$dev3 bs=1024 count=$[5*chunksize_in_kib] seek=$[data_offset_in_kib+chunksize_in_kib*15]
-dd if=/dev/urandom of=$dev4 bs=1024 count=$[5*chunksize_in_kib] seek=$[data_offset_in_kib+chunksize_in_kib*20]
-
-blockdev --flushbufs $devs; sync
-echo 3 > /proc/sys/vm/drop_caches
-
-$dir/raid6check $md0 0 0 2>&1 | grep -qs "Error" || { echo should detect errors; exit 2; }
-
-$dir/raid6check $md0 0 0 autorepair > /dev/null || { echo repair failed; exit 2; }
-blockdev --flushbufs $md0 $devs; sync
-echo 3 > /proc/sys/vm/drop_caches
-
-$dir/raid6check $md0 0 0 2>&1 | grep -qs "Error" && { echo errors detected; exit 2; }
-cmp -s -n $array_data_size_in_b $md0 /tmp/RandFile || { echo cmp failed ; exit 2; }
-
-mdadm -S $md0
-udevadm settle
+
+# perform test for every layout
+layouts="ls rs la ra parity-first ddf-zero-restart ddf-N-restart ddf-N-continue \
+       left-asymmetric-6 right-asymmetric-6 left-symmetric-6 \
+       right-symmetric-6 parity-first-6"
+
+for layout in $layouts
+do
+    mdadm -CR $md0 -l6 --layout=$layout -n$number_of_disks -c $chunksize_in_kib $devs
+    dd if=/tmp/RandFile of=$md0 bs=1024 count=$array_data_size_in_kib
+    blockdev --flushbufs $md0; sync
+    check wait
+    blockdev --flushbufs $devs; sync
+    echo 3 > /proc/sys/vm/drop_caches
+    cmp -s -n $array_data_size_in_b $md0 /tmp/RandFile || { echo sanity cmp failed ; exit 2; }
+
+    # wipe out 5 chunks on each device
+    dd if=/dev/urandom of=$dev0 bs=1024 count=$[5*chunksize_in_kib] seek=$[data_offset_in_kib+chunksize_in_kib*0]
+    dd if=/dev/urandom of=$dev1 bs=1024 count=$[5*chunksize_in_kib] seek=$[data_offset_in_kib+chunksize_in_kib*5]
+    dd if=/dev/urandom of=$dev2 bs=1024 count=$[5*chunksize_in_kib] seek=$[data_offset_in_kib+chunksize_in_kib*10]
+    dd if=/dev/urandom of=$dev3 bs=1024 count=$[5*chunksize_in_kib] seek=$[data_offset_in_kib+chunksize_in_kib*15]
+    dd if=/dev/urandom of=$dev4 bs=1024 count=$[5*chunksize_in_kib] seek=$[data_offset_in_kib+chunksize_in_kib*20]
+
+    blockdev --flushbufs $devs; sync
+    echo 3 > /proc/sys/vm/drop_caches
+
+    $dir/raid6check $md0 0 0 2>&1 | grep -qs "Error" || { echo should detect errors; exit 2; }
+
+    $dir/raid6check $md0 0 0 autorepair > /dev/null || { echo repair failed; exit 2; }
+    blockdev --flushbufs $md0 $devs; sync
+    echo 3 > /proc/sys/vm/drop_caches
+
+    $dir/raid6check $md0 0 0 2>&1 | grep -qs "Error" && { echo errors detected; exit 2; }
+    cmp -s -n $array_data_size_in_b $md0 /tmp/RandFile || { echo cmp failed ; exit 2; }
+
+    mdadm -S $md0
+done

diff --git a/tests/19raid6repair b/tests/19raid6repair
index 1159bd3e47c8eefe36b9a2acf47ea89995213d5c..26846cc974aa3f34080d56a06a0bbf46343c0665 100644 (file)
--- a/tests/19raid6repair
+++ b/tests/19raid6repair
@@ -8,40 +8,49 @@ devs="$dev1 $dev2 $dev3 $dev4"
 # default 2048 sectors
 data_offset_in_kib=$[2048/2]
 
-for failure in "$dev3 3 3 2" "$dev3 3 2 3" "$dev3 3 2 1" "$dev3 3 2 0" "$dev4 3 3 0" "$dev4 3 3 1" "$dev4 3 3 2" \
-               "$dev1 3 0 1" "$dev1 3 0 2" "$dev1 3 0 3" "$dev2 3 1 0" "$dev2 3 1 2" "$dev2 3 1 3" ; do
-       failure_split=( $failure )
-       device_with_error=${failure_split[0]}
-       stripe_with_error=${failure_split[1]}
-       repair_params="$stripe_with_error ${failure_split[2]} ${failure_split[3]}"
-       start_of_errors_in_kib=$[data_offset_in_kib+chunksize_in_kib*stripe_with_error]
-
-       # make a raid5 from a file
-       dd if=/dev/urandom of=/tmp/RandFile bs=1024 count=$array_data_size_in_kib
-       mdadm -CR $md0 -l6 -n$number_of_disks -c $chunksize_in_kib $devs
-       dd if=/tmp/RandFile of=$md0 bs=1024 count=$array_data_size_in_kib
-       blockdev --flushbufs $md0; sync
-
-       check wait
-       blockdev --flushbufs $devs; sync
-       echo 3 > /proc/sys/vm/drop_caches
-       cmp -s -n $array_data_size_in_b $md0 /tmp/RandFile || { echo sanity cmp failed ; exit 2; }
-
-       dd if=/dev/urandom of=$device_with_error bs=1024 count=$chunksize_in_kib seek=$start_of_errors_in_kib
-       blockdev --flushbufs $device_with_error; sync
-       echo 3 > /proc/sys/vm/drop_caches
-
-       $dir/raid6check $md0 0 0 2>&1 | grep -qs "Error" || { echo should detect errors; exit 2; }
-
-       $dir/raid6check $md0 repair $repair_params > /dev/null || { echo repair failed; exit 2; }
-       blockdev --flushbufs $md0 $devs; sync
-       echo 3 > /proc/sys/vm/drop_caches
-
-       $dir/raid6check $md0 0 0 2>&1 | grep -qs "Error" && { echo errors detected; exit 2; }
-       cmp -s -n $array_data_size_in_b $md0 /tmp/RandFile || { echo cmp failed ; exit 2; }
-
-       mdadm -S $md0
-       udevadm settle
-       sync
-       echo 3 > /proc/sys/vm/drop_caches
+layouts="ls rs la ra parity-first ddf-zero-restart ddf-N-restart ddf-N-continue \
+       left-asymmetric-6 right-asymmetric-6 left-symmetric-6 \
+       right-symmetric-6 parity-first-6"
+
+for layout in $layouts
+do
+    for failure in "$dev3 3 3 2" "$dev3 3 2 3" "$dev3 3 2 1" "$dev3 3 2 0" \
+               "$dev4 3 3 0" "$dev4 3 3 1" "$dev4 3 3 2" \
+               "$dev1 3 0 1" "$dev1 3 0 2" "$dev1 3 0 3" \
+               "$dev2 3 1 0" "$dev2 3 1 2" "$dev2 3 1 3" ; do
+           failure_split=( $failure )
+           device_with_error=${failure_split[0]}
+           stripe_with_error=${failure_split[1]}
+           repair_params="$stripe_with_error ${failure_split[2]} ${failure_split[3]}"
+           start_of_errors_in_kib=$[data_offset_in_kib+chunksize_in_kib*stripe_with_error]
+
+           # make a raid5 from a file
+           dd if=/dev/urandom of=/tmp/RandFile bs=1024 count=$array_data_size_in_kib
+           mdadm -CR $md0 -l6 --layout=$layout -n$number_of_disks -c $chunksize_in_kib $devs
+           dd if=/tmp/RandFile of=$md0 bs=1024 count=$array_data_size_in_kib
+           blockdev --flushbufs $md0; sync
+
+           check wait
+           blockdev --flushbufs $devs; sync
+           echo 3 > /proc/sys/vm/drop_caches
+           cmp -s -n $array_data_size_in_b $md0 /tmp/RandFile || { echo sanity cmp failed ; exit 2; }
+
+           dd if=/dev/urandom of=$device_with_error bs=1024 count=$chunksize_in_kib seek=$start_of_errors_in_kib
+           blockdev --flushbufs $device_with_error; sync
+           echo 3 > /proc/sys/vm/drop_caches
+
+           $dir/raid6check $md0 0 0 2>&1 | grep -qs "Error" || { echo should detect errors; exit 2; }
+
+           $dir/raid6check $md0 repair $repair_params > /dev/null || { echo repair failed; exit 2; }
+           blockdev --flushbufs $md0 $devs; sync
+           echo 3 > /proc/sys/vm/drop_caches
+
+           $dir/raid6check $md0 0 0 2>&1 | grep -qs "Error" && { echo errors detected; exit 2; }
+           cmp -s -n $array_data_size_in_b $md0 /tmp/RandFile || { echo cmp failed ; exit 2; }
+
+           mdadm -S $md0
+           udevadm settle
+           sync
+           echo 3 > /proc/sys/vm/drop_caches
+    done
 done