mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
test: use aux wait_recalc
Use aux function.
This commit is contained in:
parent
2043bb0e38
commit
1f4e3832e0
@ -94,43 +94,12 @@ _verify_data_on_lv() {
|
||||
lvchange -an $vg/$lv1
|
||||
}
|
||||
|
||||
_sync_percent() {
|
||||
local checklv=$1
|
||||
get lv_field "$checklv" sync_percent | cut -d. -f1
|
||||
}
|
||||
|
||||
_wait_sync() {
|
||||
local checklv=$1
|
||||
|
||||
for i in $(seq 1 10) ; do
|
||||
sync=$(_sync_percent "$checklv")
|
||||
echo "sync_percent is $sync"
|
||||
|
||||
if test "$sync" = "100"; then
|
||||
return
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
done
|
||||
|
||||
# TODO: There is some strange bug, first leg of RAID with integrity
|
||||
# enabled never gets in sync. I saw this in BB, but not when executing
|
||||
# the commands manually
|
||||
if test -z "$sync"; then
|
||||
echo "TEST\ WARNING: Resync of dm-integrity device '$checklv' failed"
|
||||
dmsetup status "$DM_DEV_DIR/mapper/${checklv/\//-}"
|
||||
exit
|
||||
fi
|
||||
echo "timeout waiting for recalc"
|
||||
return 1
|
||||
}
|
||||
|
||||
# lvrename
|
||||
_prepare_vg
|
||||
lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg
|
||||
_wait_sync $vg/${lv1}_rimage_0
|
||||
_wait_sync $vg/${lv1}_rimage_1
|
||||
_wait_sync $vg/$lv1
|
||||
aux wait_recalc $vg/${lv1}_rimage_0
|
||||
aux wait_recalc $vg/${lv1}_rimage_1
|
||||
aux wait_recalc $vg/$lv1
|
||||
_add_new_data_to_mnt
|
||||
umount $mnt
|
||||
lvrename $vg/$lv1 $vg/$lv2
|
||||
@ -146,9 +115,9 @@ vgremove -ff $vg
|
||||
# lv must be active
|
||||
_prepare_vg
|
||||
lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2"
|
||||
_wait_sync $vg/${lv1}_rimage_0
|
||||
_wait_sync $vg/${lv1}_rimage_1
|
||||
_wait_sync $vg/$lv1
|
||||
aux wait_recalc $vg/${lv1}_rimage_0
|
||||
aux wait_recalc $vg/${lv1}_rimage_1
|
||||
aux wait_recalc $vg/$lv1
|
||||
lvs -o raidintegritymode $vg/$lv1 | grep journal
|
||||
_add_new_data_to_mnt
|
||||
lvconvert --replace "$dev1" $vg/$lv1 "$dev3"
|
||||
@ -169,9 +138,9 @@ vgremove -ff $vg
|
||||
# same as prev but with bitmap mode
|
||||
_prepare_vg
|
||||
lvcreate --type raid1 -m1 --raidintegrity y --raidintegritymode bitmap -n $lv1 -l 8 $vg "$dev1" "$dev2"
|
||||
_wait_sync $vg/${lv1}_rimage_0
|
||||
_wait_sync $vg/${lv1}_rimage_1
|
||||
_wait_sync $vg/$lv1
|
||||
aux wait_recalc $vg/${lv1}_rimage_0
|
||||
aux wait_recalc $vg/${lv1}_rimage_1
|
||||
aux wait_recalc $vg/$lv1
|
||||
lvs -o raidintegritymode $vg/$lv1 | grep bitmap
|
||||
_add_new_data_to_mnt
|
||||
lvconvert --replace "$dev1" $vg/$lv1 "$dev3"
|
||||
@ -194,9 +163,9 @@ vgremove -ff $vg
|
||||
# (like lvconvert --replace does for a dev that's not missing).
|
||||
_prepare_vg
|
||||
lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2"
|
||||
_wait_sync $vg/${lv1}_rimage_0
|
||||
_wait_sync $vg/${lv1}_rimage_1
|
||||
_wait_sync $vg/$lv1
|
||||
aux wait_recalc $vg/${lv1}_rimage_0
|
||||
aux wait_recalc $vg/${lv1}_rimage_1
|
||||
aux wait_recalc $vg/$lv1
|
||||
_add_new_data_to_mnt
|
||||
aux disable_dev "$dev2"
|
||||
lvs -a -o+devices $vg > out
|
||||
@ -223,9 +192,9 @@ vgremove -ff $vg
|
||||
|
||||
_prepare_vg
|
||||
lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 8 $vg "$dev1" "$dev2"
|
||||
_wait_sync $vg/${lv1}_rimage_0
|
||||
_wait_sync $vg/${lv1}_rimage_1
|
||||
_wait_sync $vg/$lv1
|
||||
aux wait_recalc $vg/${lv1}_rimage_0
|
||||
aux wait_recalc $vg/${lv1}_rimage_1
|
||||
aux wait_recalc $vg/$lv1
|
||||
_add_new_data_to_mnt
|
||||
umount $mnt
|
||||
lvchange -an $vg/$lv1
|
||||
|
Loading…
Reference in New Issue
Block a user