Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests, imsm: Set correct expected offset between volumes 

Since 611d9529 (imsm: change reserved space to 4MB) gap between RAID
volumes has changed. Tests should expect correct offset in size
calulations.

Fix expected offset for tests.

Signed-off-by: Michal Zylowski <michal.zylowski@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
This commit is contained in:
Michal Zylowski 2018-06-22 16:34:07 +02:00 committed by Jes Sorensen
parent d94eb07f82
commit 6adfeaa7a2
13 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/09imsm-create-fail-rebuild
View File

@ -36,7 +36,7 @@ mdadm -CR $member0 $dev0 $dev1 -n $num_disks -l $level -z $size -c $chunk
imsm_check member $member0 $num_disks $level $size $((size*2)) $offset $chunk imsm_check member $member0 $num_disks $level $size $((size*2)) $offset $chunk
testdev $member0 $num_disks $size $chunk testdev $member0 $num_disks $size $chunk
offset=$(((size & ~(chunk - 1)) + 2048)) offset=$(((size & ~(chunk - 1)) + 4096))
size=4000 size=4000
level=1 level=1
chunk=0 chunk=0
@ -60,7 +60,7 @@ mdadm -CR $member0 $dev0 $dev1 $dev2 $dev3 -n $num_disks -l $level -z $size -c $
imsm_check member $member0 $num_disks $level $size $((size*2)) $offset $chunk imsm_check member $member0 $num_disks $level $size $((size*2)) $offset $chunk
testdev $member0 $((num_disks-2)) $size $chunk testdev $member0 $((num_disks-2)) $size $chunk
offset=$(((size & ~(chunk - 1)) + 2048)) offset=$(((size & ~(chunk - 1)) + 4096))
size=4000 size=4000
level=5 level=5
mdadm -CR $member1 $dev0 $dev1 $dev2 $dev3 -n $num_disks -l $level -z $size -c $chunk mdadm -CR $member1 $dev0 $dev1 $dev2 $dev3 -n $num_disks -l $level -z $size -c $chunk

10
tests/09imsm-overlap
View File

@ -18,13 +18,11 @@ udevadm settle
offset=0 offset=0
imsm_check member $member0 $num_disks $level $size 1024 $offset imsm_check member $member0 $num_disks $level $size 1024 $offset
offset=$((offset+size+2048)) offset=$((offset+size+4096))
imsm_check member $member1 $num_disks $level $size 1024 $offset imsm_check member $member1 $num_disks $level $size 1024 $offset
offset=$((offset+size+2048)) offset=$((offset+size+4096))
imsm_check member $member2 $num_disks $level $size 1024 $offset imsm_check member $member2 $num_disks $level $size 1024 $offset
# at this point there should be more freespace at the start of the disk offset=$((offset+size+4096))
# than the end
offset=0
imsm_check member $member3 $num_disks $level $size 1024 $offset imsm_check member $member3 $num_disks $level $size 1024 $offset
offset=$((offset+size+2048)) offset=$((offset+size+4096))
imsm_check member $member4 $num_disks $level $size 1024 $offset imsm_check member $member4 $num_disks $level $size 1024 $offset

2
tests/13imsm-r0_r0_2d-grow-r0_r0_4d
View File

@ -19,7 +19,7 @@ vol1_level=0
vol1_comp_size=$((5 * 1024)) vol1_comp_size=$((5 * 1024))
vol1_chunk=64 vol1_chunk=64
vol1_num_comps=$num_disks vol1_num_comps=$num_disks
vol1_offset=$((vol0_comp_size + 2048)) vol1_offset=$((vol0_comp_size + 4096))
# After: RAID 0 volume in slot #0, 4 disks, 128k chunk size # After: RAID 0 volume in slot #0, 4 disks, 128k chunk size
# RAID 0 volume in slot #1, 4 disks, 64k chunk size # RAID 0 volume in slot #1, 4 disks, 64k chunk size

2
tests/13imsm-r0_r0_2d-grow-r0_r0_5d
View File

@ -19,7 +19,7 @@ vol1_level=0
vol1_comp_size=$((6 * 1024)) vol1_comp_size=$((6 * 1024))
vol1_chunk=256 vol1_chunk=256
vol1_num_comps=$num_disks vol1_num_comps=$num_disks
vol1_offset=$((vol0_comp_size + 2048)) vol1_offset=$((vol0_comp_size + 4096))
# After: RAID 0 volume in slot #0, 5 disks, 64k chunk size # After: RAID 0 volume in slot #0, 5 disks, 64k chunk size
# RAID 0 volume in slot #1, 5 disks, 256k chunk size # RAID 0 volume in slot #1, 5 disks, 256k chunk size

2
tests/13imsm-r0_r0_3d-grow-r0_r0_4d
View File

@ -19,7 +19,7 @@ vol1_level=0
vol1_comp_size=$((5 * 1024)) vol1_comp_size=$((5 * 1024))
vol1_chunk=128 vol1_chunk=128
vol1_num_comps=$num_disks vol1_num_comps=$num_disks
vol1_offset=$((vol0_comp_size + 2048)) vol1_offset=$((vol0_comp_size + 4096))
# After: RAID0 volume in slot #0, 4 disks, 128k chunk size # After: RAID0 volume in slot #0, 4 disks, 128k chunk size
# RAID0 volume in slot #1, 4 disks, 512k chunk size # RAID0 volume in slot #1, 4 disks, 512k chunk size

2
tests/13imsm-r0_r5_3d-grow-r0_r5_4d
View File

@ -19,7 +19,7 @@ vol1_level=5
vol1_comp_size=$((5 * 1024)) vol1_comp_size=$((5 * 1024))
vol1_chunk=128 vol1_chunk=128
vol1_num_comps=$((num_disks - 1)) vol1_num_comps=$((num_disks - 1))
vol1_offset=$((vol0_comp_size + 2048)) vol1_offset=$((vol0_comp_size + 4096))
# After: RAID 0 volume in slot #0, 4 disks, 64k chunk size # After: RAID 0 volume in slot #0, 4 disks, 64k chunk size
# RAID 5 volume in slot #1, 4 disks, 128k chunk size # RAID 5 volume in slot #1, 4 disks, 128k chunk size

2
tests/13imsm-r0_r5_3d-grow-r0_r5_5d
View File

@ -19,7 +19,7 @@ vol1_level=5
vol1_comp_size=$((5 * 1024)) vol1_comp_size=$((5 * 1024))
vol1_chunk=128 vol1_chunk=128
vol1_num_comps=$((num_disks - 1)) vol1_num_comps=$((num_disks - 1))
vol1_offset=$((vol0_comp_size + 2048)) vol1_offset=$((vol0_comp_size + 4096))
# After: RAID 0 volume in slot #0, 5 disks, 256k chunk size # After: RAID 0 volume in slot #0, 5 disks, 256k chunk size
# RAID 5 volume in slot #1, 5 disks, 512k chunk size # RAID 5 volume in slot #1, 5 disks, 512k chunk size

2
tests/13imsm-r5_r0_3d-grow-r5_r0_4d
View File

@ -18,7 +18,7 @@ vol0_offset=0
vol1_level=0 vol1_level=0
vol1_comp_size=$((5 * 1024)) vol1_comp_size=$((5 * 1024))
vol1_chunk=64 vol1_chunk=64
vol1_offset=$((vol0_comp_size + 2048)) vol1_offset=$((vol0_comp_size + 4096))
vol1_num_comps=$num_disks vol1_num_comps=$num_disks
# After: RAID 5 volume in slot #0, 4 disks, 64k chunk size # After: RAID 5 volume in slot #0, 4 disks, 64k chunk size

2
tests/13imsm-r5_r0_3d-grow-r5_r0_5d
View File

@ -18,7 +18,7 @@ vol0_offset=0
vol1_level=0 vol1_level=0
vol1_comp_size=$((5 * 1024)) vol1_comp_size=$((5 * 1024))
vol1_chunk=64 vol1_chunk=64
vol1_offset=$((vol0_comp_size + 2048)) vol1_offset=$((vol0_comp_size + 4096))
vol1_num_comps=$num_disks vol1_num_comps=$num_disks
# After: RAID 5 volume in slot #0, 5 disks, 128k chunk size # After: RAID 5 volume in slot #0, 5 disks, 128k chunk size

2
tests/14imsm-r0_3d-r5_3d-migrate-r5_4d-r5_4d
View File

@ -19,7 +19,7 @@ vol1_level=5
vol1_comp_size=$((5 * 1024)) vol1_comp_size=$((5 * 1024))
vol1_chunk=64 vol1_chunk=64
vol1_num_comps=$((num_disks - 1)) vol1_num_comps=$((num_disks - 1))
vol1_offset=$((vol0_comp_size + 2048)) vol1_offset=$((vol0_comp_size + 4096))
# After: RAID 5 volume, 4 disks, 64k chunk size (only member #0) # After: RAID 5 volume, 4 disks, 64k chunk size (only member #0)
vol0_new_level=5 vol0_new_level=5

2
tests/14imsm-r0_r0_2d-takeover-r10_4d
View File

@ -20,7 +20,7 @@ vol1_level=0
vol1_comp_size=$((5 * 1024)) vol1_comp_size=$((5 * 1024))
vol1_chunk=64 vol1_chunk=64
vol1_num_comps=num_disks vol1_num_comps=num_disks
vol1_offset=$(( $vol0_comp_size + 2048 )) vol1_offset=$(( $vol0_comp_size + 4096 ))
# After: RAID 10, 4 disks, 64k chunk size # After: RAID 10, 4 disks, 64k chunk size
vol0_new_level=10 vol0_new_level=10

2
tests/14imsm-r10_r5_4d-takeover-r0_2d
View File

@ -20,7 +20,7 @@ vol1_level=5
vol1_comp_size=$((5 * 1024)) vol1_comp_size=$((5 * 1024))
vol1_chunk=64 vol1_chunk=64
vol1_num_comps=$(( $num_disks - 1 )) vol1_num_comps=$(( $num_disks - 1 ))
vol1_offset=$(( $vol0_comp_size + 2048 )) vol1_offset=$(( $vol0_comp_size + 4096 ))
# After: RAID 10, 4 disks, 64k chunk size # After: RAID 10, 4 disks, 64k chunk size
vol0_new_level=0 vol0_new_level=0

2
tests/15imsm-r5_r0_3d_64k-migrate-r5_r0_3d_256k
View File

@ -24,7 +24,7 @@ vol1_level=0
vol1_comp_size=$((5 * 1024)) vol1_comp_size=$((5 * 1024))
vol1_chunk=64 vol1_chunk=64
vol1_num_comps=$num_disks vol1_num_comps=$num_disks
vol1_offset=$((vol0_comp_size + 2048)) vol1_offset=$((vol0_comp_size + 4096))
# After migration paramters # After migration paramters
vol1_new_level=0 vol1_new_level=0