diff options
| author | David Teigland <teigland@redhat.com> | 2015-03-10 09:59:52 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2015-03-10 09:59:52 -0500 |
| commit | c7290759b059c65e2dbd56e498186b4b8acc8315 (patch) | |
| tree | af8f793f09344d03f1ce13ccb9e45c401eab56d9 | |
| parent | f5cc96a54e9563b8aa5445a049facbe30a59fb39 (diff) | |
| download | lvm2-c7290759b059c65e2dbd56e498186b4b8acc8315.tar.gz | |
tests: update to not run vgconvert -M with lvmetad
| -rw-r--r-- | test/shell/metadata.sh | 3 | ||||
| -rw-r--r-- | test/shell/pvcreate-usage.sh | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/test/shell/metadata.sh b/test/shell/metadata.sh index 3adb68432..251942f56 100644 --- a/test/shell/metadata.sh +++ b/test/shell/metadata.sh @@ -57,6 +57,9 @@ check pv_field "$dev3" pe_start $pv_align pvs --units k -o name,pe_start,vg_mda_size,vg_name $(cat DEVICES) +# vgconvert -M does not work with lvmetad +test -e LOCAL_LVMETAD && exit 0 + # upgrade from v1 to v2 metadata vgconvert -M2 $vg diff --git a/test/shell/pvcreate-usage.sh b/test/shell/pvcreate-usage.sh index 48d2cebe9..5e916c396 100644 --- a/test/shell/pvcreate-usage.sh +++ b/test/shell/pvcreate-usage.sh @@ -131,18 +131,30 @@ check pv_field "$dev1" pv_mda_count 2 #COMM 'pv with LVM1 compatible data alignment can be convereted' #compatible == LVM1_PE_ALIGN == 64k +if test ! -e LOCAL_LVMETAD; then pvcreate --dataalignment 256k "$dev1" vgcreate -s 1m $vg "$dev1" vgconvert -M1 $vg vgconvert -M2 $vg check pv_field "$dev1" pe_start 256.00k vgremove $vg +fi #COMM 'pv with LVM1 incompatible data alignment cannot be convereted' +if test ! -e LOCAL_LVMETAD; then pvcreate --dataalignment 10k "$dev1" vgcreate -s 1m $vg "$dev1" not vgconvert -M1 $vg vgremove $vg +fi + +#COMM 'vgconvert -M is disallowed with lvmetad' +if test -e LOCAL_LVMETAD; then +pvcreate "$dev1" +vgcreate $vg "$dev1" +not vgconvert -M1 $vg +vgremove $vg +fi #COMM 'vgcfgrestore allows pe_start=0' #basically it produces nonsense, but it tests vgcfgrestore, |