main - tests: more skipped tests for lvmpolld
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8e9bc52b15106d0edaf...
Commit: 8e9bc52b15106d0edaf47f56e4f467f8365597f0
Parent: a55f4a8fe24a89c9a7e42e2fcd11c974eae0e127
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Mar 26 22:13:37 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Mar 26 22:13:37 2021 +0100
tests: more skipped tests for lvmpolld
---
test/shell/lvmlockd-hello-world.sh | 3 ++-
test/shell/lvmlockd-lv-types.sh | 3 ++-
test/shell/pv-range-overflow.sh | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/test/shell/lvmlockd-hello-world.sh b/test/shell/lvmlockd-hello-world.sh
index 43946a54b..2e1d3291c 100644
--- a/test/shell/lvmlockd-hello-world.sh
+++ b/test/shell/lvmlockd-hello-world.sh
@@ -12,6 +12,8 @@
test_description='Hello world for vgcreate $SHARED with lvmlockd and sanlock'
+SKIP_WITH_LVMPOLLD=1
+
. lib/inittest
[ -z "$LVM_TEST_LVMLOCKD" ] && skip
@@ -23,4 +25,3 @@ vgcreate $SHARED $vg "$dev1"
vgs -o+locktype,lockargs $vg
vgremove $vg
-
diff --git a/test/shell/lvmlockd-lv-types.sh b/test/shell/lvmlockd-lv-types.sh
index 3503f2420..6138e5623 100644
--- a/test/shell/lvmlockd-lv-types.sh
+++ b/test/shell/lvmlockd-lv-types.sh
@@ -12,6 +12,8 @@
test_description='Check lvmlockd lock_args for different LV types'
+SKIP_WITH_LVMPOLLD=1
+
. lib/inittest
[ -z "$LVM_TEST_LVMLOCKD" ] && skip;
@@ -182,4 +184,3 @@ lvchange -an $vg/lv4
lvremove $vg/lv4
vgremove $vg
-
diff --git a/test/shell/pv-range-overflow.sh b/test/shell/pv-range-overflow.sh
index f880a1311..ab845a942 100644
--- a/test/shell/pv-range-overflow.sh
+++ b/test/shell/pv-range-overflow.sh
@@ -13,6 +13,7 @@
# 'Ensure that pvmove diagnoses PE-range values 2^32 and larger.'
+SKIP_WITH_LVMPOLLD=1
. lib/inittest
3 years
main - tests: use shell comment
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a55f4a8fe24a89c9a7e...
Commit: a55f4a8fe24a89c9a7e42e2fcd11c974eae0e127
Parent: 93336685f6cf8a178cb83aa1ee113a2a33ca7f5c
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Mar 26 22:12:42 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Mar 26 22:12:42 2021 +0100
tests: use shell comment
---
test/shell/hints.sh | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/test/shell/hints.sh b/test/shell/hints.sh
index b2a53c678..a11aeec23 100644
--- a/test/shell/hints.sh
+++ b/test/shell/hints.sh
@@ -12,9 +12,11 @@
SKIP_WITH_LVMPOLLD=1
-/* hints are currently disabled with lvmlockd */
+# hints are currently disabled with lvmlockd
SKIP_WITH_LVMLOCKD=1
+. lib/inittest
+
RUNDIR="/run"
test -d "$RUNDIR" || RUNDIR="/var/run"
HINTS="$RUNDIR/lvm/hints"
@@ -22,8 +24,6 @@ NOHINTS="$RUNDIR/lvm/nohints"
NEWHINTS="$RUNDIR/lvm/newhints"
PREV="$RUNDIR/lvm/prev-hints"
-. lib/inittest
-
# TODO:
# Test commands that ignore hints
# Test flock
@@ -55,7 +55,7 @@ not grep scan: tmptest
# test that 'pvs' submits only three reads, one for each PV in hints
# for initial scan, and one more in vg_read rescan check
-if [ -e "/usr/bin/strace" ]; then
+if which strace; then
strace -e io_submit pvs 2>&1|tee tmptest
test "$(grep io_submit tmptest | wc -l)" -eq 3
@@ -413,4 +413,3 @@ grep $vg4 $HINTS
vgremove -y $vg4
vgremove -y $vg2
vgremove -y $vg1
-
3 years
main - tests: update dbus test_nesting
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=93336685f6cf8a178cb...
Commit: 93336685f6cf8a178cb83aa1ee113a2a33ca7f5c
Parent: 1d6e1d08a887d602234485f0214edc3552e843e0
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Mar 26 20:21:57 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Mar 26 20:39:41 2021 +0100
tests: update dbus test_nesting
Test has to use PV with suffix pv[0..9] otherwise
it's ignored by test suite filter.
Better fix for VG names to use prefix LVMTEST.
Skip the test for runs without LVM_TEST_DEVDIR != /dev
---
test/dbus/lvmdbustest.py | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/test/dbus/lvmdbustest.py b/test/dbus/lvmdbustest.py
index 6dab312c0..746025903 100755
--- a/test/dbus/lvmdbustest.py
+++ b/test/dbus/lvmdbustest.py
@@ -26,6 +26,9 @@ g_tmo = 0
# Prefix on created objects to enable easier clean-up
g_prefix = os.getenv('PREFIX', '')
+# Check dev dir prefix for test suite (LVM_TEST_DEVDIR
+dm_dev_dir = os.getenv('DM_DEV_DIR', '/dev')
+
# Use the session bus instead of the system bus
use_session = os.getenv('LVM_DBUSD_USE_SESSION', False)
@@ -59,10 +62,10 @@ if pv_device_list:
def vg_n(prefix=None):
- name = g_prefix + '_vg'
+ name = rs(8, '_vg')
if prefix:
name = prefix + name
- return name
+ return g_prefix + name
def lv_n(suffix=None):
@@ -70,7 +73,7 @@ def lv_n(suffix=None):
s = '_lv'
else:
s = suffix
- return g_prefix + rs(8, s)
+ return rs(8, s)
def _is_testsuite_pv(pv_name):
@@ -338,7 +341,7 @@ class TestDbusService(unittest.TestCase):
if not pv_paths:
pv_paths = self._all_pv_object_paths()
- vg_name = vg_n(prefix=vg_prefix)
+ vg_name = vg_n()
vg_path = self.handle_return(
self.objs[MANAGER_INT][0].Manager.VgCreate(
@@ -1811,7 +1814,7 @@ class TestDbusService(unittest.TestCase):
pv_object_path, vg.Vg.Pvs, "Expecting PV object path in Vg.Pvs")
lv = self._create_lv(
- vg=vg.Vg, size=vg.Vg.FreeBytes, suffix="_pv")
+ vg=vg.Vg, size=vg.Vg.FreeBytes, suffix="_pv0")
device_path = '/dev/%s/%s' % (vg.Vg.Name, lv.LvCommon.Name)
new_pv_object_path = self._pv_create(device_path)
@@ -1837,6 +1840,9 @@ class TestDbusService(unittest.TestCase):
# by editing lvm.conf with "devices/scan_lvs = 1" As testing
# typically utilizes loopback, this test is skipped in
# those environments.
+
+ if dm_dev_dir != '/dev':
+ raise unittest.SkipTest('test not running in real /dev')
pv_object_path = self.objs[PV_INT][0].object_path
if not self.objs[PV_INT][0].Pv.Name.startswith("/dev"):
raise unittest.SkipTest('test not running in /dev')
3 years
main - tests: update for newer thin-pool
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1d6e1d08a887d602234...
Commit: 1d6e1d08a887d602234485f0214edc3552e843e0
Parent: 51ac56a05e9da2c28ef5047345468fed4946078a
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Mar 26 16:53:18 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Mar 26 20:39:41 2021 +0100
tests: update for newer thin-pool
Newer thin-pool handle metadata read-only recovery better.
---
test/shell/thin-flags.sh | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/test/shell/thin-flags.sh b/test/shell/thin-flags.sh
index 78a4b2cd7..89ed69ac9 100644
--- a/test/shell/thin-flags.sh
+++ b/test/shell/thin-flags.sh
@@ -98,7 +98,22 @@ not lvcreate -V10 -n $lv3 $vg/pool
lvs -ao+seg_pe_ranges $vg
# needs_check needs newer version
-if aux have_thin 1 16 0 ; then
+if aux have_thin 1 19 0 ; then
+ check lv_attr_bit state $vg/pool "a"
+
+ dmsetup suspend $vg-pool-tpool
+
+ check lv_attr_bit state $vg/pool "s"
+
+ dmsetup resume $vg-pool-tpool
+
+ lvresize -L+2M $vg/pool_tmeta
+
+ # Newer version recovers when metadata grow up
+ check lv_attr_bit state $vg/pool "a"
+ check lv_field $vg/pool lv_health_status ""
+
+elif aux have_thin 1 16 0 ; then
check lv_attr_bit state $vg/pool "c"
check lv_field $vg/pool lv_check_needed "check needed"
3 years
main - tests: use blkid without caching
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=51ac56a05e9da2c28ef...
Commit: 51ac56a05e9da2c28ef5047345468fed4946078a
Parent: 02e02a5ccc7275c23e59e65df25287c8f82276fa
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Mar 26 16:12:47 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Mar 26 20:39:41 2021 +0100
tests: use blkid without caching
Always use blkid without caching to avoid poluting
cache stored in /run/blkid or /etc on older distros
---
test/shell/integrity-blocksize.sh | 42 +++++++++++++++++++-------------------
test/shell/pvcreate-md-fake-hdr.sh | 2 +-
test/shell/writecache-blocksize.sh | 2 +-
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/test/shell/integrity-blocksize.sh b/test/shell/integrity-blocksize.sh
index 329a2f73f..a85070cc5 100644
--- a/test/shell/integrity-blocksize.sh
+++ b/test/shell/integrity-blocksize.sh
@@ -41,7 +41,7 @@ aux prepare_devs 1
vgcreate $vg "$dev1"
lvcreate -n $lv1 -l8 $vg
mkfs.xfs -f "$DM_DEV_DIR/$vg/$lv1"
-blkid "$DM_DEV_DIR/$vg/$lv1" | grep BLOCK_SIZE || skip
+blkid -c /dev/null "$DM_DEV_DIR/$vg/$lv1" | grep BLOCK_SIZE || skip
lvchange -an $vg
vgremove -ff $vg
@@ -145,9 +145,9 @@ lvremove -y $vg2/$lv1
lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1
aux wipefs_a /dev/$vg1/$lv1
mkfs.xfs -f "$DM_DEV_DIR/$vg1/$lv1"
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"512\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"512\"
lvconvert --raidintegrity y $vg1/$lv1
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"512\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"512\"
mount "$DM_DEV_DIR/$vg1/$lv1" $mnt
umount $mnt
pvck --dump metadata $LOOP1 | grep 'block_size = 512'
@@ -157,9 +157,9 @@ lvremove -y $vg1/$lv1
lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg2
aux wipefs_a /dev/$vg2/$lv1
mkfs.xfs -f "$DM_DEV_DIR/$vg2/$lv1"
-blkid "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\"
lvconvert --raidintegrity y $vg2/$lv1
-blkid "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\"
mount "$DM_DEV_DIR/$vg2/$lv1" $mnt
umount $mnt
pvck --dump metadata $LOOP3 | grep 'block_size = 4096'
@@ -169,9 +169,9 @@ lvremove -y $vg2/$lv1
lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1
aux wipefs_a /dev/$vg1/$lv1
mkfs.ext4 -b 1024 "$DM_DEV_DIR/$vg1/$lv1"
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\"
lvconvert --raidintegrity y $vg1/$lv1
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\"
mount "$DM_DEV_DIR/$vg1/$lv1" $mnt
umount $mnt
pvck --dump metadata $LOOP1 | grep 'block_size = 512'
@@ -181,11 +181,11 @@ lvremove -y $vg1/$lv1
lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1
aux wipefs_a /dev/$vg1/$lv1
mkfs.ext4 -b 1024 "$DM_DEV_DIR/$vg1/$lv1"
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\"
lvchange -an $vg1/$lv1
lvconvert --raidintegrity y $vg1/$lv1
lvchange -ay $vg1/$lv1
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\"
mount "$DM_DEV_DIR/$vg1/$lv1" $mnt
umount $mnt
pvck --dump metadata $LOOP1 | grep 'block_size = 1024'
@@ -195,9 +195,9 @@ lvremove -y $vg1/$lv1
lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg2
aux wipefs_a /dev/$vg2/$lv1
mkfs.ext4 "$DM_DEV_DIR/$vg2/$lv1"
-blkid "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\"
lvconvert --raidintegrity y $vg2/$lv1
-blkid "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\"
mount "$DM_DEV_DIR/$vg2/$lv1" $mnt
umount $mnt
pvck --dump metadata $LOOP3 | grep 'block_size = 4096'
@@ -207,10 +207,10 @@ lvremove -y $vg2/$lv1
lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1
aux wipefs_a /dev/$vg1/$lv1
mkfs.xfs -f -s size=4096 "$DM_DEV_DIR/$vg1/$lv1"
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"4096\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"4096\"
lvconvert --raidintegrity y --raidintegrityblocksize 512 $vg1/$lv1
lvs -o raidintegrityblocksize $vg1/$lv1 | grep 512
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"4096\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"4096\"
mount "$DM_DEV_DIR/$vg1/$lv1" $mnt
umount $mnt
pvck --dump metadata $LOOP1 | grep 'block_size = 512'
@@ -220,13 +220,13 @@ lvremove -y $vg1/$lv1
lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1
aux wipefs_a /dev/$vg1/$lv1
mkfs.xfs -f -s size=4096 "$DM_DEV_DIR/$vg1/$lv1"
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"4096\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"4096\"
lvchange -an $vg1/$lv1
# lv needs to be inactive to increase LBS from 512
lvconvert --raidintegrity y --raidintegrityblocksize 1024 $vg1/$lv1
lvs -o raidintegrityblocksize $vg1/$lv1 | grep 1024
lvchange -ay $vg1/$lv1
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"4096\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"4096\"
mount "$DM_DEV_DIR/$vg1/$lv1" $mnt
umount $mnt
pvck --dump metadata $LOOP1 | grep 'block_size = 1024'
@@ -236,9 +236,9 @@ lvremove -y $vg1/$lv1
lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1
aux wipefs_a /dev/$vg1/$lv1
mkfs.ext4 -b 1024 "$DM_DEV_DIR/$vg1/$lv1"
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\"
lvconvert --raidintegrity y --raidintegrityblocksize 512 $vg1/$lv1
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\"
mount "$DM_DEV_DIR/$vg1/$lv1" $mnt
umount $mnt
pvck --dump metadata $LOOP1 | grep 'block_size = 512'
@@ -263,14 +263,14 @@ mkfs.xfs -f "$DM_DEV_DIR/$vg1/$lv1"
mount "$DM_DEV_DIR/$vg1/$lv1" $mnt
echo "test" > $mnt/test
umount $mnt
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"512\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"512\"
lvchange -an $vg1/$lv1
lvconvert --raidintegrity y $vg1/$lv1
lvchange -ay $vg1/$lv1
mount "$DM_DEV_DIR/$vg1/$lv1" $mnt
cat $mnt/test
umount $mnt
-blkid "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"512\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"512\"
pvck --dump metadata $LOOP1 | grep 'block_size = 512'
lvchange -an $vg1/$lv1
lvremove -y $vg1/$lv1
@@ -282,14 +282,14 @@ mkfs.xfs -f "$DM_DEV_DIR/$vg2/$lv1"
mount "$DM_DEV_DIR/$vg2/$lv1" $mnt
echo "test" > $mnt/test
umount $mnt
-blkid "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\"
lvchange -an $vg2/$lv1
lvconvert --raidintegrity y $vg2/$lv1
lvchange -ay $vg2/$lv1
mount "$DM_DEV_DIR/$vg2/$lv1" $mnt
cat $mnt/test
umount $mnt
-blkid "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\"
+blkid -c /dev/null "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\"
pvck --dump metadata $LOOP3 | grep 'block_size = 4096'
lvchange -an $vg2/$lv1
lvremove -y $vg2/$lv1
diff --git a/test/shell/pvcreate-md-fake-hdr.sh b/test/shell/pvcreate-md-fake-hdr.sh
index 7a16ef5e4..73846ed71 100644
--- a/test/shell/pvcreate-md-fake-hdr.sh
+++ b/test/shell/pvcreate-md-fake-hdr.sh
@@ -59,7 +59,7 @@ sleep 3
# print what blkid thinks about each PV
for i in "$dev1" "$dev2" "$dev3" "$dev4"
do
- blkid -c /dev/null -w /dev/null "$i" || echo "Unknown signature"
+ blkid -c /dev/null "$i" || echo "Unknown signature"
done
# expect open count for each PV to be 0
diff --git a/test/shell/writecache-blocksize.sh b/test/shell/writecache-blocksize.sh
index 74f8c2ae5..a8bb1e49d 100644
--- a/test/shell/writecache-blocksize.sh
+++ b/test/shell/writecache-blocksize.sh
@@ -144,7 +144,7 @@ aux prepare_devs 2 64
vgcreate $vg "$dev1"
lvcreate -n $lv1 -L50 $vg
mkfs.xfs -f "$DM_DEV_DIR/$vg/$lv1"
-blkid "$DM_DEV_DIR/$vg/$lv1" | grep BLOCK_SIZE || skip
+blkid -c /dev/null "$DM_DEV_DIR/$vg/$lv1" | grep BLOCK_SIZE || skip
lvchange -an $vg
vgremove -ff $vg
3 years
main - tests: use aux mdadm_assemble wrapper
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=02e02a5ccc7275c23e5...
Commit: 02e02a5ccc7275c23e59e65df25287c8f82276fa
Parent: 4c59b2aa216cb5649fe5e3f54230e85ee994869b
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Mar 26 16:07:24 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Mar 26 20:39:41 2021 +0100
tests: use aux mdadm_assemble wrapper
---
test/shell/lvm-on-md.sh | 19 ++-----------------
test/shell/pvcreate-md-fake-hdr.sh | 4 ++--
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/test/shell/lvm-on-md.sh b/test/shell/lvm-on-md.sh
index 7c14e6748..d2810b8cf 100644
--- a/test/shell/lvm-on-md.sh
+++ b/test/shell/lvm-on-md.sh
@@ -27,19 +27,6 @@ _clear_online_files() {
. lib/inittest
-which mdadm || skip
-
-STRACE=
-[ "$DM_DEV_DIR" = "/dev" ] && mdadm -V 2>&1 | grep " v3.2" && {
- # use this 'trick' to slow down mdadm which otherwise
- # is racing with udev rule since mdadm internally
- # opens and closes raid leg devices in RW mode and then
- # tries to get exlusive access to the leg device during
- # insertion to kernel and fails during assembly
- # There could be more affted version of mdadm.
- STRACE="strace -f -o /dev/null"
-}
-
# This stops lvm from taking advantage of hints which
# will have already excluded md components.
@@ -121,8 +108,7 @@ test ! -f "$RUNDIR/lvm/vgs_online/$vg"
# should not show an active lv
not dmsetup info $vg-$lv1
-$STRACE mdadm --assemble "$mddev" "$dev1" "$dev2"
-aux udev_wait
+aux mdadm_assemble "$mddev" "$dev1" "$dev2"
not pvs "$dev1"
not pvs "$dev2"
@@ -276,8 +262,7 @@ test ! -f "$RUNDIR/lvm/vgs_online/$vg"
not dmsetup info $vg-$lv1
# start the md dev
-$STRACE mdadm --assemble "$mddev" "$dev1" "$dev2"
-aux udev_wait
+aux mdadm_assemble "$mddev" "$dev1" "$dev2"
not pvs "$dev1"
not pvs "$dev2"
diff --git a/test/shell/pvcreate-md-fake-hdr.sh b/test/shell/pvcreate-md-fake-hdr.sh
index 1550bc4c0..7a16ef5e4 100644
--- a/test/shell/pvcreate-md-fake-hdr.sh
+++ b/test/shell/pvcreate-md-fake-hdr.sh
@@ -88,8 +88,8 @@ if mdadm --detail "$mddev" ; then
fi
# now reassemble array from PV1 & PV2
-mdadm --assemble --verbose "$mddev" "$dev1" "$dev2"
-aux udev_wait
+aux mdadm_assemble --verbose "$mddev" "$dev1" "$dev2"
+
sleep 1
# and let 'fake hdr' to be fixed from master/primary leg
3 years
main - tests: add aux mdadm_assemble
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4c59b2aa216cb5649fe...
Commit: 4c59b2aa216cb5649fe5e3f54230e85ee994869b
Parent: 5ef8d845694c79683ebdbdeec69eb2e534f4b1d2
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Mar 26 16:05:42 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Mar 26 20:39:41 2021 +0100
tests: add aux mdadm_assemble
Wrapper for slowed version of mdadm --assemble
---
test/lib/aux.sh | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 6cf86bc38..0ce2b8b07 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -780,6 +780,22 @@ mdadm_create() {
done
}
+mdadm_assemble() {
+ STRACE=
+ [ "$DM_DEV_DIR" = "/dev" ] && mdadm -V 2>&1 | grep " v3.2" && {
+ # use this 'trick' to slow down mdadm which otherwise
+ # is racing with udev rule since mdadm internally
+ # opens and closes raid leg devices in RW mode and then
+ # tries to get exlusive access to the leg device during
+ # insertion to kernel and fails during assembly
+ # There can be some other affected version of mdadm.
+ STRACE="strace -f -o /dev/null"
+ }
+
+ $STRACE mdadm --assemble "$@"
+ udev_wait
+}
+
cleanup_md_dev() {
local IFS=$IFS_NL
local i
3 years
main - tests: better reporting of problematic services
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5ef8d845694c79683eb...
Commit: 5ef8d845694c79683ebdbdeec69eb2e534f4b1d2
Parent: 49575a6ce1940528aaaac5eada8f8938e6cf4a84
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Mar 26 16:06:46 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Mar 26 20:39:40 2021 +0100
tests: better reporting of problematic services
---
test/shell/000-basic.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/shell/000-basic.sh b/test/shell/000-basic.sh
index a7b80c72b..15f2a6021 100644
--- a/test/shell/000-basic.sh
+++ b/test/shell/000-basic.sh
@@ -38,11 +38,11 @@ not lvs "${DEVICES[@]}"
# validate testing machine with its services is in expected state and will not interfere with tests
if systemctl -a >out 2>/dev/null ; then
for i in dm-event lvm2-lvmpolld lvm2-monitor ; do
- echo $i
- grep $i out | not grep -v masked || {
- cat out
- should not echo "Present unmasked $i service/socket may randomize testing results!"
- echo "+++++ Stop & Mask with systemctl +++++"
- }
+ grep $i out > mout || continue
+ grep -v masked mout || continue
+ should not echo "Present unmasked $i service/socket may randomize testing results!"
+ echo "+++++ Stop & Mask with systemctl +++++"
+ touch show_out
done
+ test ! -e show_out || cat out
fi
3 years
main - tests: skip more tests for lvmpolld pass
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=49575a6ce1940528aaa...
Commit: 49575a6ce1940528aaaac5eada8f8938e6cf4a84
Parent: 7768650d87d4086a76f1558aab4436acda1b5e44
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Mar 26 16:05:28 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Mar 26 20:39:40 2021 +0100
tests: skip more tests for lvmpolld pass
These test do not test polling, so skip them for lvmpolld pass.
---
test/api/dbustest.sh | 1 +
test/shell/exported.sh | 2 ++
test/shell/lvm-conf-error.sh | 2 ++
test/shell/metadata-bad-mdaheader.sh | 2 ++
test/shell/metadata-bad-text.sh | 2 ++
test/shell/metadata-old.sh | 2 ++
test/shell/missing-pv-unused.sh | 13 +++----------
test/shell/missing-pv.sh | 9 +++------
test/shell/outdated-pv.sh | 8 +++-----
test/shell/pvck-dump.sh | 3 +++
test/shell/pvck-repair.sh | 4 ++++
11 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/test/api/dbustest.sh b/test/api/dbustest.sh
index 83e40d056..622022277 100644
--- a/test/api/dbustest.sh
+++ b/test/api/dbustest.sh
@@ -11,6 +11,7 @@
# 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_LVMPOLLD=1
SKIP_WITH_LVMLOCKD=1
SKIP_WITH_CLVMD=1
diff --git a/test/shell/exported.sh b/test/shell/exported.sh
index b6d17ce7d..18a86462f 100644
--- a/test/shell/exported.sh
+++ b/test/shell/exported.sh
@@ -10,6 +10,8 @@
# 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_LVMPOLLD=1
+
. lib/inittest
# Check what is and is not permitted on an exported VG/PV
diff --git a/test/shell/lvm-conf-error.sh b/test/shell/lvm-conf-error.sh
index 01461c174..590834bbe 100644
--- a/test/shell/lvm-conf-error.sh
+++ b/test/shell/lvm-conf-error.sh
@@ -12,6 +12,8 @@
# Check what happens when reading of lvm.conf fails
+SKIP_WITH_LVMPOLLD=1
+
. lib/inittest
MKFS=mkfs.ext3
diff --git a/test/shell/metadata-bad-mdaheader.sh b/test/shell/metadata-bad-mdaheader.sh
index 2096dbba8..ad2bcc496 100644
--- a/test/shell/metadata-bad-mdaheader.sh
+++ b/test/shell/metadata-bad-mdaheader.sh
@@ -10,6 +10,8 @@
# 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_LVMPOLLD=1
+
. lib/inittest
xxd -v || skip
diff --git a/test/shell/metadata-bad-text.sh b/test/shell/metadata-bad-text.sh
index 971b861ca..9ccfe5f76 100644
--- a/test/shell/metadata-bad-text.sh
+++ b/test/shell/metadata-bad-text.sh
@@ -10,6 +10,8 @@
# 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_LVMPOLLD=1
+
RUNDIR="/run"
test -d "$RUNDIR" || RUNDIR="/var/run"
PVS_ONLINE_DIR="$RUNDIR/lvm/pvs_online"
diff --git a/test/shell/metadata-old.sh b/test/shell/metadata-old.sh
index a193ebf31..ad7bf101e 100644
--- a/test/shell/metadata-old.sh
+++ b/test/shell/metadata-old.sh
@@ -10,6 +10,8 @@
# 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_LVMPOLLD=1
+
. lib/inittest
aux prepare_devs 3
diff --git a/test/shell/missing-pv-unused.sh b/test/shell/missing-pv-unused.sh
index 2265a5bd9..d74365ffc 100644
--- a/test/shell/missing-pv-unused.sh
+++ b/test/shell/missing-pv-unused.sh
@@ -10,12 +10,11 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-. lib/inittest
+SKIP_WITH_LVMPOLLD=1
-aux prepare_devs 3
-get_devs
+. lib/inittest
-vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3"
+aux prepare_vg 3
lvcreate -n $lv1 -L8M $vg "$dev2"
lvcreate -n $lv2 -L8M $vg "$dev3"
@@ -24,10 +23,6 @@ lvcreate -n $lv4 -L8M $vg "$dev3"
vgchange -an $vg
-pvs
-vgs
-lvs -a -o+devices
-
# Fail device that is not used by any LVs.
aux disable_dev "$dev1"
@@ -81,6 +76,4 @@ pvs
vgs
lvs -a -o+devices
-vgchange -an $vg
vgremove -ff $vg
-
diff --git a/test/shell/missing-pv.sh b/test/shell/missing-pv.sh
index 74cc43b0e..3662483b0 100644
--- a/test/shell/missing-pv.sh
+++ b/test/shell/missing-pv.sh
@@ -10,12 +10,11 @@
# along with this program; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-. lib/inittest
+SKIP_WITH_LVMPOLLD=1
-aux prepare_devs 3
-get_devs
+. lib/inittest
-vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3"
+aux prepare_vg 3
lvcreate -n $lv1 -L8M --type mirror -m 1 $vg
lvcreate -n $lv2 -L8M --type mirror -m 1 $vg
@@ -147,6 +146,4 @@ pvs
vgs
lvs -a -o+devices
-vgchange -an $vg
vgremove -ff $vg
-
diff --git a/test/shell/outdated-pv.sh b/test/shell/outdated-pv.sh
index 5c9b1b2f3..6a361d3ce 100644
--- a/test/shell/outdated-pv.sh
+++ b/test/shell/outdated-pv.sh
@@ -10,10 +10,11 @@
# 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_LVMPOLLD=1
+
. lib/inittest
-aux prepare_devs 3
-get_devs
+aux prepare_vg 3
#
# Test handling of "outdated PV" which occurs when a PV goes missing
@@ -22,8 +23,6 @@ get_devs
# member. That outdated metadata needs to be cleared.
#
-vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3"
-
lvcreate -n $lv1 -l1 -an $vg "$dev1"
lvcreate -n $lv2 -l1 -an $vg "$dev1"
@@ -63,4 +62,3 @@ pvs "$dev2" | tee out
grep "$vg" out
vgremove -ff $vg
-
diff --git a/test/shell/pvck-dump.sh b/test/shell/pvck-dump.sh
index c27fcc471..81e164d73 100644
--- a/test/shell/pvck-dump.sh
+++ b/test/shell/pvck-dump.sh
@@ -10,6 +10,9 @@
# 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_LVMPOLLD=1
+SKIP_WITH_LVMLOCKD=1
+
. lib/inittest
SIZE_MB=80
diff --git a/test/shell/pvck-repair.sh b/test/shell/pvck-repair.sh
index d48e25198..0a794da68 100644
--- a/test/shell/pvck-repair.sh
+++ b/test/shell/pvck-repair.sh
@@ -10,6 +10,10 @@
# 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_LVMPOLLD=1
+SKIP_WITH_LVMLOCKD=1
+
+
. lib/inittest
SIZE=34
3 years
main - tests: add commented example
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7768650d87d4086a76f...
Commit: 7768650d87d4086a76f1558aab4436acda1b5e44
Parent: 25c665d5559e77c1eb0f67527fa95419a84b7553
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Fri Mar 26 13:16:44 2021 +0100
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Fri Mar 26 13:16:44 2021 +0100
tests: add commented example
How to run individual test.
---
test/api/dbustest.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/test/api/dbustest.sh b/test/api/dbustest.sh
index d922d903f..83e40d056 100644
--- a/test/api/dbustest.sh
+++ b/test/api/dbustest.sh
@@ -32,4 +32,8 @@ aux prepare_profiles "lvmdbusd"
aux prepare_lvmdbusd
+# Example for testing individual test:
+#"$TESTOLDPWD/dbus/lvmdbustest.py" -v TestDbusService.test_lv_interface_cache_lv
+#"$TESTOLDPWD/dbus/lvmdbustest.py" -v TestDbusService.test_pv_symlinks
+
"$TESTOLDPWD/dbus/lvmdbustest.py" -v
3 years