More fixes for tests.
Some more fixes to help some tests run properly. Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
af538d59c1
commit
4ccc2562ac
|
@ -8,7 +8,7 @@ dd if=/dev/urandom of=/tmp/RandFile bs=1024 count=$testK
|
||||||
export MDADM_GROW_VERIFY=1
|
export MDADM_GROW_VERIFY=1
|
||||||
|
|
||||||
dotest() {
|
dotest() {
|
||||||
sleep 0.5
|
sleep 2
|
||||||
check wait
|
check wait
|
||||||
testdev $md0 $1 19968 64 nd
|
testdev $md0 $1 19968 64 nd
|
||||||
blockdev --flushbufs $md0
|
blockdev --flushbufs $md0
|
||||||
|
|
|
@ -59,7 +59,7 @@ mdadm -Ss
|
||||||
# Now try to assemble using mdadm.conf
|
# Now try to assemble using mdadm.conf
|
||||||
mdadm -Asc /var/tmp/mdadm.conf
|
mdadm -Asc /var/tmp/mdadm.conf
|
||||||
check nosync # This failed once. The raid5 was resyncing.
|
check nosync # This failed once. The raid5 was resyncing.
|
||||||
|
udevadm settle
|
||||||
mdadm -Dbs | sort > /tmp/mdadm.conf
|
mdadm -Dbs | sort > /tmp/mdadm.conf
|
||||||
sort /var/tmp/mdadm.conf | diff /tmp/mdadm.conf -
|
sort /var/tmp/mdadm.conf | diff /tmp/mdadm.conf -
|
||||||
mdadm -Ss
|
mdadm -Ss
|
||||||
|
@ -74,7 +74,7 @@ do
|
||||||
[ `cat /tmp/cnt` -eq 3 ]
|
[ `cat /tmp/cnt` -eq 3 ]
|
||||||
done
|
done
|
||||||
check nosync
|
check nosync
|
||||||
|
udevadm settle
|
||||||
mdadm -Dbs | sort > /tmp/mdadm.conf
|
mdadm -Dbs | sort > /tmp/mdadm.conf
|
||||||
sort /var/tmp/mdadm.conf | diff /tmp/mdadm.conf -
|
sort /var/tmp/mdadm.conf | diff /tmp/mdadm.conf -
|
||||||
mdadm -Ss
|
mdadm -Ss
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
. tests/env-imsm-template
|
. tests/env-imsm-template
|
||||||
|
|
||||||
# RAID 5 volume (3 disks) migrate to RAID 0 volume (3 disks)
|
# RAID 5 volume (3 disks) migrate to RAID 0 volume (2 disks)
|
||||||
# POSITIVE test
|
# POSITIVE test
|
||||||
|
|
||||||
num_disks=3
|
num_disks=3
|
||||||
|
@ -13,9 +13,9 @@ vol0_chunk=64
|
||||||
vol0_num_comps=$((num_disks - 1))
|
vol0_num_comps=$((num_disks - 1))
|
||||||
vol0_offset=0
|
vol0_offset=0
|
||||||
|
|
||||||
# After: RAID 5, 4 disks, 64k chunk size
|
# After: RAID 0, 3 disks, 64k chunk size
|
||||||
vol0_new_level=0
|
vol0_new_level=0
|
||||||
vol0_new_num_comps=$num_disks
|
vol0_new_num_comps=$((num_disks-1))
|
||||||
vol0_new_chunk=64
|
vol0_new_chunk=64
|
||||||
|
|
||||||
. tests/imsm-grow-template 0 1
|
. tests/imsm-grow-template 0 1
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
. tests/env-imsm-template
|
. tests/env-imsm-template
|
||||||
|
|
||||||
# RAID 5 volume (5 disks) migration to RAID 0 volume (5 disks)
|
# RAID 5 volume (5 disks) migration to RAID 0 volume (4 disks)
|
||||||
# POSITIVE test
|
# POSITIVE test
|
||||||
|
|
||||||
num_disks=5
|
num_disks=5
|
||||||
|
@ -15,7 +15,7 @@ vol0_offset=0
|
||||||
|
|
||||||
# After: RAID 0 volume, 5 disks, 64k chunk size
|
# After: RAID 0 volume, 5 disks, 64k chunk size
|
||||||
vol0_new_level=0
|
vol0_new_level=0
|
||||||
vol0_new_num_comps=$num_disks
|
vol0_new_num_comps=$((num_disks - 1))
|
||||||
vol0_new_chunk=64
|
vol0_new_chunk=64
|
||||||
|
|
||||||
. tests/imsm-grow-template 0 1
|
. tests/imsm-grow-template 0 1
|
||||||
|
|
Loading…
Reference in New Issue