mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-02 01:18:26 +03:00
tests: enable more working tests with lvmlockd
This commit is contained in:
parent
06b2e5c176
commit
00f6a8466e
@ -12,7 +12,6 @@
|
||||
|
||||
# Test repairing of broken cached LV
|
||||
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
SKIP_WITH_LVMLOCKD=1
|
||||
|
||||
. lib/inittest
|
||||
|
@ -10,14 +10,12 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
SKIP_WITH_LVMLOCKD=1
|
||||
|
||||
. lib/inittest
|
||||
|
||||
recreate_vg_()
|
||||
{
|
||||
vgremove -ff $vg
|
||||
vgcreate "$vg" "$@" "${DEVICES[@]}"
|
||||
vgcreate $SHARED "$vg" "$@" "${DEVICES[@]}"
|
||||
}
|
||||
|
||||
_check_mlog()
|
||||
@ -70,7 +68,11 @@ vgreduce --removemissing $vg
|
||||
aux enable_dev "$dev4"
|
||||
|
||||
# 3-way, mirrored log => 3-way, core log
|
||||
if test -n "$LVM_TEST_LVMLOCKD"; then
|
||||
recreate_vg_
|
||||
else
|
||||
recreate_vg_ -c n
|
||||
fi
|
||||
lvcreate -aey --type mirror -m 2 --mirrorlog mirrored --ignoremonitoring -L 1 -n 3way $vg \
|
||||
"$dev1" "$dev2" "$dev3" "$dev4":0 "$dev5":0
|
||||
aux disable_dev "$dev4" "$dev5"
|
||||
|
@ -10,7 +10,6 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
SKIP_WITH_LVMLOCKD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
@ -23,7 +22,7 @@ for i in "$dev1" "$dev2" "$dev3" ; do
|
||||
if test "$i" = "$j" ; then continue ; fi
|
||||
|
||||
vgremove -ff $vg
|
||||
vgcreate $vg "$dev1" "$dev2" "$dev3"
|
||||
vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3"
|
||||
# exit 1
|
||||
|
||||
lvcreate -l1 -n $lv1 $vg "$dev1"
|
||||
@ -49,7 +48,7 @@ for i in "$dev1" "$dev2" "$dev3" ; do
|
||||
done
|
||||
|
||||
vgremove -ff $vg
|
||||
vgcreate $vg "$dev1" "$dev2" "$dev3"
|
||||
vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3"
|
||||
|
||||
# use tricky 'dd'
|
||||
for i in "$dev1" "$dev2" "$dev3" ; do
|
||||
|
@ -10,7 +10,6 @@
|
||||
# along with this program; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
SKIP_WITH_LVMLOCKD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
|
@ -12,7 +12,6 @@
|
||||
|
||||
# 'Test for proper escaping of strings in metadata (bz431474)'
|
||||
|
||||
SKIP_WITH_LVMLOCKD=1
|
||||
SKIP_WITH_LVMPOLLD=1
|
||||
|
||||
. lib/inittest
|
||||
@ -42,7 +41,7 @@ pvcreate "$dev1" || created="$dev2"
|
||||
pvdisplay 2>&1 | tee err
|
||||
should grep -F "$pv_ugly" err
|
||||
should check pv_field "$dev1" pv_name "$dev1"
|
||||
vgcreate $vg "$created"
|
||||
vgcreate $SHARED $vg "$created"
|
||||
# 'no parse errors and VG really exists'
|
||||
vgs $vg 2>err
|
||||
not grep "Parse error" err
|
||||
|
Loading…
Reference in New Issue
Block a user