diff options
Diffstat (limited to 'debian/patches/0033-tests-imsm-Set-correct-expected-offset-between-volum.patch')
-rw-r--r-- | debian/patches/0033-tests-imsm-Set-correct-expected-offset-between-volum.patch | 220 |
1 files changed, 220 insertions, 0 deletions
diff --git a/debian/patches/0033-tests-imsm-Set-correct-expected-offset-between-volum.patch b/debian/patches/0033-tests-imsm-Set-correct-expected-offset-between-volum.patch new file mode 100644 index 00000000..acd48e3b --- /dev/null +++ b/debian/patches/0033-tests-imsm-Set-correct-expected-offset-between-volum.patch @@ -0,0 +1,220 @@ +From 6adfeaa7a23775a70d22b79a672a4b1a542455b4 Mon Sep 17 00:00:00 2001 +From: Michal Zylowski <michal.zylowski@intel.com> +Date: Fri, 22 Jun 2018 16:34:07 +0200 +Subject: [PATCH 33/40] 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> +--- + tests/09imsm-create-fail-rebuild | 4 ++-- + tests/09imsm-overlap | 10 ++++------ + tests/13imsm-r0_r0_2d-grow-r0_r0_4d | 2 +- + tests/13imsm-r0_r0_2d-grow-r0_r0_5d | 2 +- + tests/13imsm-r0_r0_3d-grow-r0_r0_4d | 2 +- + tests/13imsm-r0_r5_3d-grow-r0_r5_4d | 2 +- + tests/13imsm-r0_r5_3d-grow-r0_r5_5d | 2 +- + tests/13imsm-r5_r0_3d-grow-r5_r0_4d | 2 +- + tests/13imsm-r5_r0_3d-grow-r5_r0_5d | 2 +- + tests/14imsm-r0_3d-r5_3d-migrate-r5_4d-r5_4d | 2 +- + tests/14imsm-r0_r0_2d-takeover-r10_4d | 2 +- + tests/14imsm-r10_r5_4d-takeover-r0_2d | 2 +- + tests/15imsm-r5_r0_3d_64k-migrate-r5_r0_3d_256k | 2 +- + 13 files changed, 17 insertions(+), 19 deletions(-) + +diff --git a/tests/09imsm-create-fail-rebuild b/tests/09imsm-create-fail-rebuild +index de17f321..886d385a 100644 +--- a/tests/09imsm-create-fail-rebuild ++++ b/tests/09imsm-create-fail-rebuild +@@ -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 + testdev $member0 $num_disks $size $chunk + +-offset=$(((size & ~(chunk - 1)) + 2048)) ++offset=$(((size & ~(chunk - 1)) + 4096)) + size=4000 + level=1 + 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 + testdev $member0 $((num_disks-2)) $size $chunk + +-offset=$(((size & ~(chunk - 1)) + 2048)) ++offset=$(((size & ~(chunk - 1)) + 4096)) + size=4000 + level=5 + mdadm -CR $member1 $dev0 $dev1 $dev2 $dev3 -n $num_disks -l $level -z $size -c $chunk +diff --git a/tests/09imsm-overlap b/tests/09imsm-overlap +index e832257c..2d1ab692 100644 +--- a/tests/09imsm-overlap ++++ b/tests/09imsm-overlap +@@ -18,13 +18,11 @@ udevadm settle + + offset=0 + 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 +-offset=$((offset+size+2048)) ++offset=$((offset+size+4096)) + imsm_check member $member2 $num_disks $level $size 1024 $offset +-# at this point there should be more freespace at the start of the disk +-# than the end +-offset=0 ++offset=$((offset+size+4096)) + 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 +diff --git a/tests/13imsm-r0_r0_2d-grow-r0_r0_4d b/tests/13imsm-r0_r0_2d-grow-r0_r0_4d +index f85efa5d..66ceeb36 100644 +--- a/tests/13imsm-r0_r0_2d-grow-r0_r0_4d ++++ b/tests/13imsm-r0_r0_2d-grow-r0_r0_4d +@@ -19,7 +19,7 @@ vol1_level=0 + vol1_comp_size=$((5 * 1024)) + vol1_chunk=64 + 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 + # RAID 0 volume in slot #1, 4 disks, 64k chunk size +diff --git a/tests/13imsm-r0_r0_2d-grow-r0_r0_5d b/tests/13imsm-r0_r0_2d-grow-r0_r0_5d +index 1b851a9b..0da9ef32 100644 +--- a/tests/13imsm-r0_r0_2d-grow-r0_r0_5d ++++ b/tests/13imsm-r0_r0_2d-grow-r0_r0_5d +@@ -19,7 +19,7 @@ vol1_level=0 + vol1_comp_size=$((6 * 1024)) + vol1_chunk=256 + 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 + # RAID 0 volume in slot #1, 5 disks, 256k chunk size +diff --git a/tests/13imsm-r0_r0_3d-grow-r0_r0_4d b/tests/13imsm-r0_r0_3d-grow-r0_r0_4d +index 27ba83b3..1ff60257 100644 +--- a/tests/13imsm-r0_r0_3d-grow-r0_r0_4d ++++ b/tests/13imsm-r0_r0_3d-grow-r0_r0_4d +@@ -19,7 +19,7 @@ vol1_level=0 + vol1_comp_size=$((5 * 1024)) + vol1_chunk=128 + 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 + # RAID0 volume in slot #1, 4 disks, 512k chunk size +diff --git a/tests/13imsm-r0_r5_3d-grow-r0_r5_4d b/tests/13imsm-r0_r5_3d-grow-r0_r5_4d +index b4bde449..2977f367 100644 +--- a/tests/13imsm-r0_r5_3d-grow-r0_r5_4d ++++ b/tests/13imsm-r0_r5_3d-grow-r0_r5_4d +@@ -19,7 +19,7 @@ vol1_level=5 + vol1_comp_size=$((5 * 1024)) + vol1_chunk=128 + 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 + # RAID 5 volume in slot #1, 4 disks, 128k chunk size +diff --git a/tests/13imsm-r0_r5_3d-grow-r0_r5_5d b/tests/13imsm-r0_r5_3d-grow-r0_r5_5d +index d0db9aeb..ff15ad09 100644 +--- a/tests/13imsm-r0_r5_3d-grow-r0_r5_5d ++++ b/tests/13imsm-r0_r5_3d-grow-r0_r5_5d +@@ -19,7 +19,7 @@ vol1_level=5 + vol1_comp_size=$((5 * 1024)) + vol1_chunk=128 + 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 + # RAID 5 volume in slot #1, 5 disks, 512k chunk size +diff --git a/tests/13imsm-r5_r0_3d-grow-r5_r0_4d b/tests/13imsm-r5_r0_3d-grow-r5_r0_4d +index 32ebc924..9fed88a2 100644 +--- a/tests/13imsm-r5_r0_3d-grow-r5_r0_4d ++++ b/tests/13imsm-r5_r0_3d-grow-r5_r0_4d +@@ -18,7 +18,7 @@ vol0_offset=0 + vol1_level=0 + vol1_comp_size=$((5 * 1024)) + vol1_chunk=64 +-vol1_offset=$((vol0_comp_size + 2048)) ++vol1_offset=$((vol0_comp_size + 4096)) + vol1_num_comps=$num_disks + + # After: RAID 5 volume in slot #0, 4 disks, 64k chunk size +diff --git a/tests/13imsm-r5_r0_3d-grow-r5_r0_5d b/tests/13imsm-r5_r0_3d-grow-r5_r0_5d +index a97002d0..e8beddc3 100644 +--- a/tests/13imsm-r5_r0_3d-grow-r5_r0_5d ++++ b/tests/13imsm-r5_r0_3d-grow-r5_r0_5d +@@ -18,7 +18,7 @@ vol0_offset=0 + vol1_level=0 + vol1_comp_size=$((5 * 1024)) + vol1_chunk=64 +-vol1_offset=$((vol0_comp_size + 2048)) ++vol1_offset=$((vol0_comp_size + 4096)) + vol1_num_comps=$num_disks + + # After: RAID 5 volume in slot #0, 5 disks, 128k chunk size +diff --git a/tests/14imsm-r0_3d-r5_3d-migrate-r5_4d-r5_4d b/tests/14imsm-r0_3d-r5_3d-migrate-r5_4d-r5_4d +index 386abeee..cb7328a9 100644 +--- a/tests/14imsm-r0_3d-r5_3d-migrate-r5_4d-r5_4d ++++ b/tests/14imsm-r0_3d-r5_3d-migrate-r5_4d-r5_4d +@@ -19,7 +19,7 @@ vol1_level=5 + vol1_comp_size=$((5 * 1024)) + vol1_chunk=64 + 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) + vol0_new_level=5 +diff --git a/tests/14imsm-r0_r0_2d-takeover-r10_4d b/tests/14imsm-r0_r0_2d-takeover-r10_4d +index df5b0ce3..d068abb3 100644 +--- a/tests/14imsm-r0_r0_2d-takeover-r10_4d ++++ b/tests/14imsm-r0_r0_2d-takeover-r10_4d +@@ -20,7 +20,7 @@ vol1_level=0 + vol1_comp_size=$((5 * 1024)) + vol1_chunk=64 + 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 + vol0_new_level=10 +diff --git a/tests/14imsm-r10_r5_4d-takeover-r0_2d b/tests/14imsm-r10_r5_4d-takeover-r0_2d +index 9e5205e2..720e575b 100644 +--- a/tests/14imsm-r10_r5_4d-takeover-r0_2d ++++ b/tests/14imsm-r10_r5_4d-takeover-r0_2d +@@ -20,7 +20,7 @@ vol1_level=5 + vol1_comp_size=$((5 * 1024)) + vol1_chunk=64 + 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 + vol0_new_level=0 +diff --git a/tests/15imsm-r5_r0_3d_64k-migrate-r5_r0_3d_256k b/tests/15imsm-r5_r0_3d_64k-migrate-r5_r0_3d_256k +index da218efa..f9369d5d 100644 +--- a/tests/15imsm-r5_r0_3d_64k-migrate-r5_r0_3d_256k ++++ b/tests/15imsm-r5_r0_3d_64k-migrate-r5_r0_3d_256k +@@ -24,7 +24,7 @@ vol1_level=0 + vol1_comp_size=$((5 * 1024)) + vol1_chunk=64 + vol1_num_comps=$num_disks +-vol1_offset=$((vol0_comp_size + 2048)) ++vol1_offset=$((vol0_comp_size + 4096)) + + # After migration paramters + vol1_new_level=0 +-- +2.17.1 + |