diff options
| author | David Teigland <teigland@redhat.com> | 2019-01-31 10:10:28 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2019-01-31 11:32:30 -0600 |
| commit | 90bf285941ad7af3ea5d7dc9e229c3de84a836bc (patch) | |
| tree | 88047bca68fd7fd204c99124363657c82c60a4e9 | |
| parent | 61dc563bc8f7794edde5935ca422231a5ef50560 (diff) | |
| download | lvm2-dev-dct-read-9.tar.gz | |
use vgck updatemetadata in testsdev-dct-read-9
| -rw-r--r-- | test/shell/lvconvert-repair-policy.sh | 2 | ||||
| -rw-r--r-- | test/shell/lvconvert-repair.sh | 6 | ||||
| -rw-r--r-- | test/shell/mirror-vgreduce-removemissing.sh | 2 | ||||
| -rw-r--r-- | test/shell/pv-ext-flags.sh | 4 | ||||
| -rw-r--r-- | test/shell/unlost-pv.sh | 6 |
5 files changed, 15 insertions, 5 deletions
diff --git a/test/shell/lvconvert-repair-policy.sh b/test/shell/lvconvert-repair-policy.sh index f9fca0028..b69658ea6 100644 --- a/test/shell/lvconvert-repair-policy.sh +++ b/test/shell/lvconvert-repair-policy.sh @@ -24,6 +24,8 @@ aux lvmconf 'allocation/maximise_cling = 0' \ cleanup_() { vgreduce --removemissing $vg for d in "$@"; do aux enable_dev "$d"; done + # clear the outdated metadata on enabled devs before we can reuse them + vgck --updatemetadata $vg for d in "$@"; do vgextend $vg "$d"; done lvremove -ff $vg/mirror lvcreate -aey --type mirror -m 1 --ignoremonitoring -l 2 -n mirror $vg "$dev1" "$dev2" "$dev3:0" diff --git a/test/shell/lvconvert-repair.sh b/test/shell/lvconvert-repair.sh index ae8fa7e98..0d0231e30 100644 --- a/test/shell/lvconvert-repair.sh +++ b/test/shell/lvconvert-repair.sh @@ -106,17 +106,23 @@ lvconvert -y --repair $vg/mirror vgreduce --removemissing $vg aux enable_dev "$dev1" +# clear the outdated dev before we can reuse it +vgck --updatemetadata $vg vgextend $vg "$dev1" aux disable_dev "$dev2" lvconvert -y --repair $vg/mirror vgreduce --removemissing $vg aux enable_dev "$dev2" +# clear the outdated dev before we can reuse it +vgck --updatemetadata $vg vgextend $vg "$dev2" aux disable_dev "$dev3" lvconvert -y --repair $vg/mirror vgreduce --removemissing $vg aux enable_dev "$dev3" +# clear the outdated dev before we can reuse it +vgck --updatemetadata $vg vgextend $vg "$dev3" vgremove -ff $vg diff --git a/test/shell/mirror-vgreduce-removemissing.sh b/test/shell/mirror-vgreduce-removemissing.sh index d95a0ac7b..08275c2bd 100644 --- a/test/shell/mirror-vgreduce-removemissing.sh +++ b/test/shell/mirror-vgreduce-removemissing.sh @@ -123,6 +123,8 @@ check_and_cleanup_lvs_() recover_vg_() { aux enable_dev "$@" + # clear outdated metadata on PVs so they can be used again + vgck --updatemetadata $vg pvcreate -ff "$@" vgextend $vg "$@" check_and_cleanup_lvs_ diff --git a/test/shell/pv-ext-flags.sh b/test/shell/pv-ext-flags.sh index 77caad5b6..22e9b3aac 100644 --- a/test/shell/pv-ext-flags.sh +++ b/test/shell/pv-ext-flags.sh @@ -73,7 +73,7 @@ vgreduce --removemissing $vg1 # now, enable $dev1 and clear the old metadata from it aux enable_dev "$dev1" -pvcreate -ff "$dev1" +vgck --updatemetadata $vg1 vgck $vg1 @@ -131,7 +131,7 @@ vgreduce --removemissing $vg1 # now, enable $dev1 and clear the old metadata from it aux enable_dev "$dev1" -pvcreate -ff "$dev1" +vgck --updatemetadata $vg1 vgck $vg1 diff --git a/test/shell/unlost-pv.sh b/test/shell/unlost-pv.sh index 7bf88b687..50f89287e 100644 --- a/test/shell/unlost-pv.sh +++ b/test/shell/unlost-pv.sh @@ -28,7 +28,7 @@ vgscan 2>&1 | tee vgscan.out grep "Inconsistent metadata found for VG $vg" vgscan.out # erase outdated dev1 -pvcreate -f "$dev1" +vgck --updatemetadata $vg vgscan 2>&1 | tee vgscan.out not grep "Inconsistent metadata found for VG $vg" vgscan.out @@ -48,7 +48,7 @@ vgscan 2>&1 | tee vgscan.out grep "Inconsistent metadata found for VG $vg" vgscan.out # write the vg to update the metadata on dev1 -lvremove $vg/boo +vgck --updatemetadata $vg vgscan 2>&1 | tee vgscan.out not grep "Inconsistent metadata found for VG $vg" vgscan.out @@ -65,7 +65,7 @@ vgscan 2>&1 | tee vgscan.out grep "Inconsistent metadata found for VG $vg" vgscan.out # erase outdated dev1 -pvcreate -f "$dev1" +vgck --updatemetadata $vg vgscan 2>&1 | tee vgscan.out not grep "Inconsistent metadata found for VG $vg" vgscan.out |