tests/imsm-grow-template change 'wait' to 'check wait'
'wait' is a shell builtin that isn't doing anything useful. It should be calling 'check wait' I think. Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
8e7ddc5f50
commit
7d1dda2c55
|
@ -8,12 +8,11 @@ vol0_comp_size=$((10 * 1024))
|
||||||
|
|
||||||
# Create container
|
# Create container
|
||||||
mdadm --create --run $container --auto=md --metadata=imsm --force --raid-disks=$vol0_num_comps $dev0
|
mdadm --create --run $container --auto=md --metadata=imsm --force --raid-disks=$vol0_num_comps $dev0
|
||||||
wait
|
check wait
|
||||||
imsm_check container $vol0_num_comps
|
imsm_check container $vol0_num_comps
|
||||||
|
|
||||||
# Create RAID 0 volume
|
# Create RAID 0 volume
|
||||||
mdadm --create --run $member0 --auto=md --level=0 --size=$vol0_comp_size --chunk=64 --force --raid-disks=$vol0_num_comps $dev0
|
mdadm --create --run $member0 --auto=md --level=0 --size=$vol0_comp_size --chunk=64 --force --raid-disks=$vol0_num_comps $dev0
|
||||||
wait
|
|
||||||
check wait
|
check wait
|
||||||
|
|
||||||
# Test the member
|
# Test the member
|
||||||
|
|
|
@ -8,12 +8,11 @@ vol0_comp_size=$((10 * 1024))
|
||||||
|
|
||||||
# Create container
|
# Create container
|
||||||
mdadm --create --run $container --auto=md --metadata=imsm --force --raid-disks=$vol0_num_comps $dev0
|
mdadm --create --run $container --auto=md --metadata=imsm --force --raid-disks=$vol0_num_comps $dev0
|
||||||
wait
|
check wait
|
||||||
imsm_check container $vol0_num_comps
|
imsm_check container $vol0_num_comps
|
||||||
|
|
||||||
# Create RAID 1 volume
|
# Create RAID 1 volume
|
||||||
mdadm --create --run $member0 --auto=md --level=1 --size=$vol0_comp_size --chunk=64 --raid-disks=$((vol0_num_comps + 1)) $dev0 missing
|
mdadm --create --run $member0 --auto=md --level=1 --size=$vol0_comp_size --chunk=64 --raid-disks=$((vol0_num_comps + 1)) $dev0 missing
|
||||||
wait
|
|
||||||
check wait
|
check wait
|
||||||
|
|
||||||
# Test the member0
|
# Test the member0
|
||||||
|
|
|
@ -33,17 +33,17 @@ function grow_member() {
|
||||||
|
|
||||||
# Create container
|
# Create container
|
||||||
mdadm --create --run $container --auto=md --metadata=imsm --raid-disks=$num_disks $device_list
|
mdadm --create --run $container --auto=md --metadata=imsm --raid-disks=$num_disks $device_list
|
||||||
wait
|
check wait
|
||||||
imsm_check container $num_disks
|
imsm_check container $num_disks
|
||||||
|
|
||||||
# Create first volume inside the container
|
# Create first volume inside the container
|
||||||
mdadm --create --run $member0 --auto=md --level=$vol0_level --size=$vol0_comp_size --chunk=$vol0_chunk --raid-disks=$num_disks $device_list
|
mdadm --create --run $member0 --auto=md --level=$vol0_level --size=$vol0_comp_size --chunk=$vol0_chunk --raid-disks=$num_disks $device_list
|
||||||
wait
|
check wait
|
||||||
|
|
||||||
# Create second volume inside the container (if defined)
|
# Create second volume inside the container (if defined)
|
||||||
if [ ! -z $vol1_chunk ]; then
|
if [ ! -z $vol1_chunk ]; then
|
||||||
mdadm --create --run $member1 --auto=md --level=$vol1_level --size=$vol1_comp_size --chunk=$vol1_chunk --raid-disks=$num_disks $device_list
|
mdadm --create --run $member1 --auto=md --level=$vol1_level --size=$vol1_comp_size --chunk=$vol1_chunk --raid-disks=$num_disks $device_list
|
||||||
wait
|
check wait
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Wait for any RESYNC to complete
|
# Wait for any RESYNC to complete
|
||||||
|
@ -63,7 +63,7 @@ fi
|
||||||
for i in $spare_list
|
for i in $spare_list
|
||||||
do
|
do
|
||||||
mdadm --add $container $i
|
mdadm --add $container $i
|
||||||
wait
|
check wait
|
||||||
num_disks=$((num_disks + 1))
|
num_disks=$((num_disks + 1))
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue