tests, imsm: Test shouldn't call grow with chunk and level in one command

Since a3b831c9 "Grow.c: Block any level migration with chunk size change"
there is no possibility to perform migration between level and chunk in
one operation. When any test tries to do this error message is printed
and tests finishes with fail.

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:10 +02:00 committed by Jes Sorensen
parent 2b2ccdc04b
commit 1a90fd8458
1 changed files with 8 additions and 3 deletions

View File

@ -13,10 +13,15 @@ function grow_member() {
local size=$5 local size=$5
local offset=$6 local offset=$6
local chunk=$7 local chunk=$7
local old_chunk=$8
local array_size=$((comps * size)) local array_size=$((comps * size))
rm -f $backup_imsm rm -f $backup_imsm
( set -ex; mdadm --grow $member --chunk=$chunk --level=$level ) if [ $chunk -eq $old_chunk ]; then
( set -ex; mdadm --grow $member --level=$level )
else
( set -ex; mdadm --grow $member --chunk=$chunk )
fi
local status=$? local status=$?
if [ $negative_test -ne 0 ]; then if [ $negative_test -ne 0 ]; then
if [ $status -eq 0 ]; then if [ $status -eq 0 ]; then
@ -76,9 +81,9 @@ if [ $migration_test -ne 0 ]; then
if [ -z $new_num_disks ]; then if [ -z $new_num_disks ]; then
new_num_disks=$num_disks new_num_disks=$num_disks
fi fi
grow_member $member0 $new_num_disks $vol0_new_num_comps $vol0_new_level $vol0_comp_size $vol0_offset $vol0_new_chunk grow_member $member0 $new_num_disks $vol0_new_num_comps $vol0_new_level $vol0_comp_size $vol0_offset $vol0_new_chunk $vol0_chunk
if [[ $vol1_new_chunk -ne 0 ]] ; then if [[ $vol1_new_chunk -ne 0 ]] ; then
grow_member $member1 $new_num_disks $vol1_new_num_comps $vol1_new_level $vol1_comp_size $vol1_offset $vol1_new_chunk grow_member $member1 $new_num_disks $vol1_new_num_comps $vol1_new_level $vol1_comp_size $vol1_offset $vol1_new_chunk $vol1_chunk
fi fi
else else
rm -f $backup_imsm rm -f $backup_imsm