main - tests: writecache adapt to 300M XFS
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=570dbad52718f558fb6...
Commit: 570dbad52718f558fb679a5f5ed87b101bfb39c1
Parent: 6990cbc16659aa8b81cb0cd40728cebe8d1d4839
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Sep 6 19:00:55 2022 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 7 15:00:15 2022 +0200
tests: writecache adapt to 300M XFS
---
test/shell/writecache-cache-blocksize-2.sh | 13 +++++++------
test/shell/writecache-cache-blocksize.sh | 25 ++++++++++++-------------
test/shell/writecache-large.sh | 9 ++++-----
test/shell/writecache-misc.sh | 6 +++---
test/shell/writecache-split.sh | 12 ++++++------
test/shell/writecache.sh | 17 ++++++++---------
6 files changed, 40 insertions(+), 42 deletions(-)
diff --git a/test/shell/writecache-cache-blocksize-2.sh b/test/shell/writecache-cache-blocksize-2.sh
index 9b5d15365..0ab715d50 100644
--- a/test/shell/writecache-cache-blocksize-2.sh
+++ b/test/shell/writecache-cache-blocksize-2.sh
@@ -119,7 +119,7 @@ _check_env() {
_run_test() {
vgcreate $SHARED $vg "$1"
vgextend $vg "$2"
- lvcreate -n $lv1 -l 8 -an $vg "$1"
+ lvcreate -n $lv1 -L 300 -an $vg "$1"
lvcreate -n $lv2 -l 4 -an $vg "$2"
lvchange -ay $vg/$lv1
mkfs.xfs -f $5 "$DM_DEV_DIR/$vg/$lv1" |tee out
@@ -156,12 +156,13 @@ _run_test() {
# dev4 LBS 512, PBS 512 (using loop)
#
-aux prepare_scsi_debug_dev 256 sector_size=512 physblk_exp=3
-aux prepare_devs 2 64
+# On scsi debug 2 PVs has to fit!
+aux prepare_scsi_debug_dev 602 sector_size=512 physblk_exp=3 || skip
+aux prepare_devs 2 301
# Tests with fs block sizes require a libblkid version that shows BLOCK_SIZE
vgcreate $vg "$dev1"
-lvcreate -n $lv1 -L50 $vg
+lvcreate -n $lv1 -L300 $vg
mkfs.xfs -f "$DM_DEV_DIR/$vg/$lv1"
blkid -c /dev/null "$DM_DEV_DIR/$vg/$lv1" | grep BLOCK_SIZE || skip
lvchange -an $vg
@@ -169,8 +170,8 @@ vgremove -ff $vg
# loopa/loopb have LBS 512 PBS 512
which fallocate || skip
-fallocate -l 64M loopa
-fallocate -l 64M loopb
+fallocate -l 301M loopa
+fallocate -l 301M loopb
for i in {1..5}; do
LOOP1=$(losetup -f loopa --show || true)
diff --git a/test/shell/writecache-cache-blocksize.sh b/test/shell/writecache-cache-blocksize.sh
index 4e17effe5..c38700755 100644
--- a/test/shell/writecache-cache-blocksize.sh
+++ b/test/shell/writecache-cache-blocksize.sh
@@ -119,7 +119,7 @@ _check_env() {
_run_test() {
vgcreate $SHARED $vg "$dev1"
vgextend $vg "$dev2"
- lvcreate -n $lv1 -l 8 -an $vg "$dev1"
+ lvcreate -n $lv1 -L 300 -an $vg "$dev1"
lvcreate -n $lv2 -l 4 -an $vg "$dev2"
lvchange -ay $vg/$lv1
mkfs.xfs -f $5 "$DM_DEV_DIR/$vg/$lv1" |tee out
@@ -147,12 +147,12 @@ _run_test() {
}
# Setup: LBS 512, PBS 512
-aux prepare_scsi_debug_dev 256 || skip
-aux prepare_devs 2 64
+aux prepare_scsi_debug_dev 602 || skip
+aux prepare_devs 2 301
# Tests with fs block sizes require a libblkid version that shows BLOCK_SIZE
vgcreate $vg "$dev1"
-lvcreate -n $lv1 -L50 $vg
+lvcreate -n $lv1 -L300 $vg
mkfs.xfs -f "$DM_DEV_DIR/$vg/$lv1"
blkid -c /dev/null "$DM_DEV_DIR/$vg/$lv1" | grep BLOCK_SIZE || skip
lvchange -an $vg
@@ -176,8 +176,8 @@ aux cleanup_scsi_debug_dev
# Setup: LBS 512, PBS 4096
-aux prepare_scsi_debug_dev 256 sector_size=512 physblk_exp=3
-aux prepare_devs 2 64
+aux prepare_scsi_debug_dev 602 sector_size=512 physblk_exp=3
+aux prepare_devs 2 301
_check_env "512" "4096"
@@ -195,10 +195,10 @@ _run_test 512 512 "cache" "--cachepool" "-s size=512"
aux cleanup_scsi_debug_dev
-
# Setup: LBS 4096, PBS 4096
-aux prepare_scsi_debug_dev 256 sector_size=4096
-aux prepare_devs 2 64
+# NOTE: Here we actually need PV of size 304M to get 300M ??
+aux prepare_scsi_debug_dev 608 sector_size=4096 || skip
+aux prepare_devs 2 304
_check_env "4096" "4096"
@@ -212,14 +212,14 @@ aux cleanup_scsi_debug_dev
# Setup: LBS 512, PBS 512
-aux prepare_scsi_debug_dev 256 || skip
-aux prepare_devs 2 64
+aux prepare_scsi_debug_dev 602 || skip
+aux prepare_devs 2 301
_check_env "512" "512"
vgcreate $SHARED $vg "$dev1"
vgextend $vg "$dev2"
-lvcreate -n $lv1 -l 8 -an $vg "$dev1"
+lvcreate -n $lv1 -L 300 -an $vg "$dev1"
lvcreate -n $lv2 -l 4 -an $vg "$dev2"
lvconvert --yes --type writecache --cachevol $lv2 --cachesettings "block_size=4096" $vg/$lv1
lvs -o writecacheblocksize $vg/$lv1 |tee out
@@ -249,4 +249,3 @@ lvremove $vg/$lv2
vgremove $vg
aux cleanup_scsi_debug_dev
-
diff --git a/test/shell/writecache-large.sh b/test/shell/writecache-large.sh
index 6391cef49..000a2cc41 100644
--- a/test/shell/writecache-large.sh
+++ b/test/shell/writecache-large.sh
@@ -118,13 +118,13 @@ lvcreate -n $lv1 -L 560M -an $vg "$dev1"
lvcreate -n $lv2 -L 500M -an $vg "$dev2"
lvchange -ay $vg/$lv1
-blockdev --getss "$DM_DEV_DIR/$vg/$lv1"
-blockdev --getpbsz "$DM_DEV_DIR/$vg/$lv1"
+blockdev --getss "$DM_DEV_DIR/$vg/$lv1"
+blockdev --getpbsz "$DM_DEV_DIR/$vg/$lv1"
lvconvert --yes --type writecache --cachevol $lv2 $vg/$lv1
dmsetup table $vg-$lv1
-blockdev --getss "$DM_DEV_DIR/$vg/$lv1"
-blockdev --getpbsz "$DM_DEV_DIR/$vg/$lv1"
+blockdev --getss "$DM_DEV_DIR/$vg/$lv1"
+blockdev --getpbsz "$DM_DEV_DIR/$vg/$lv1"
_add_new_data_to_mnt
_add_more_data_to_mnt
@@ -179,4 +179,3 @@ umount $mnt
lvchange -an $vg/$lv1
vgremove -ff $vg
-
diff --git a/test/shell/writecache-misc.sh b/test/shell/writecache-misc.sh
index f62974c54..ba8196c7f 100644
--- a/test/shell/writecache-misc.sh
+++ b/test/shell/writecache-misc.sh
@@ -47,13 +47,13 @@ mkdir -p "$mount_dir"
# generate random data
dd if=/dev/urandom of=pattern1 bs=512K count=1
-aux prepare_devs 4
+aux prepare_devs 4 301
vgcreate $vg "$dev1" "$dev2" "$dev3" "$dev4"
# Create writecache without a specified name so it gets automatic name
-lvcreate -n $lv1 -l 4 -an $vg "$dev1"
+lvcreate -n $lv1 -L 300 -an $vg "$dev1"
lvcreate -y --type writecache -l 4 --cachevol $lv1 $vg "$dev2"
check lv_exists $vg lvol0
lvremove -y $vg
@@ -62,7 +62,7 @@ lvremove -y $vg
# Test pvmove with writecache
#
-lvcreate -n $lv1 -l 16 -an $vg "$dev1" "$dev4"
+lvcreate -n $lv1 -L 300 -an $vg "$dev1" "$dev4"
lvcreate -n $lv2 -l 4 -an $vg "$dev2"
lvconvert -y --type writecache --cachevol $lv2 $vg/$lv1
diff --git a/test/shell/writecache-split.sh b/test/shell/writecache-split.sh
index f6d2d9aec..c68f29baa 100644
--- a/test/shell/writecache-split.sh
+++ b/test/shell/writecache-split.sh
@@ -46,11 +46,11 @@ mkdir -p "$mount_dir"
# generate random data
dd if=/dev/urandom of=pattern1 bs=512K count=1
-aux prepare_devs 4
+aux prepare_devs 4 301
vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3" "$dev4"
-lvcreate -n $lv1 -l 16 -an $vg "$dev1" "$dev4"
+lvcreate -n $lv1 -L 300 -an $vg "$dev1" "$dev4"
lvcreate -n $lv2 -l 4 -an $vg "$dev2"
#
@@ -123,7 +123,7 @@ vgextend --restoremissing $vg "$dev2"
#
lvremove $vg/$lv2
-lvcreate -n $lv2 -l 14 -an $vg "$dev2" "$dev3"
+lvcreate -n $lv2 -l 14 -an $vg "$dev2:0-10" "$dev3"
lvconvert -y --type writecache --cachevol $lv2 $vg/$lv1
@@ -159,7 +159,7 @@ vgremove -ff $vg
vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3" "$dev4"
-lvcreate -n $lv1 -l 16 -an $vg "$dev1" "$dev4"
+lvcreate -n $lv1 -L 300 -an $vg "$dev1" "$dev4"
lvcreate -n $lv2 -l 4 -an $vg "$dev2"
lvchange -ay $vg/$lv1
@@ -224,7 +224,7 @@ vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3" "$dev4"
# while inactive
-lvcreate -n $lv1 -l 16 -an $vg "$dev1" "$dev4"
+lvcreate -n $lv1 -L 300 -an $vg "$dev1" "$dev4"
lvcreate -n $lv2 -l 4 -an $vg "$dev2"
lvconvert -y --type writecache --cachevol $lv2 $vg/$lv1
@@ -244,7 +244,7 @@ lvremove -y $vg/$lv1
# while active
-lvcreate -n $lv1 -l 16 -an $vg "$dev1" "$dev4"
+lvcreate -n $lv1 -L 300 -an $vg "$dev1" "$dev4"
lvcreate -n $lv2 -l 4 -an $vg "$dev2"
lvconvert -y --type writecache --cachevol $lv2 $vg/$lv1
diff --git a/test/shell/writecache.sh b/test/shell/writecache.sh
index 421c5bb4f..9cb6d3f94 100644
--- a/test/shell/writecache.sh
+++ b/test/shell/writecache.sh
@@ -20,14 +20,14 @@ aux have_writecache 1 0 0 || skip
which mkfs.xfs || skip
# scsi_debug devices with 512 LBS 512 PBS
-aux prepare_scsi_debug_dev 256
+aux prepare_scsi_debug_dev 602
check sysfs "$(< SCSI_DEBUG_DEV)" queue/logical_block_size "512"
check sysfs "$(< SCSI_DEBUG_DEV)" queue/physical_block_size "512"
-aux prepare_devs 2 64
+aux prepare_devs 2 301
# Tests with fs block sizes require a libblkid version that shows BLOCK_SIZE
vgcreate $vg "$dev1"
-lvcreate -n $lv1 -L50 $vg
+lvcreate -n $lv1 -L 300 $vg
mkfs.xfs -f "$DM_DEV_DIR/$vg/$lv1"
blkid -c /dev/null "$DM_DEV_DIR/$vg/$lv1" | grep BLOCK_SIZE || skip
lvchange -an $vg
@@ -159,7 +159,7 @@ blockdev --getpbsz "$dev2"
# Test attach while inactive, detach while inactive
# create fs on LV before writecache is attached
-lvcreate -n $lv1 -l 8 -an $vg "$dev1"
+lvcreate -n $lv1 -L 300 -an $vg "$dev1"
lvcreate -n $lv2 -l 4 -an $vg "$dev2"
lvchange -ay $vg/$lv1
_add_new_data_to_mnt
@@ -193,7 +193,7 @@ lvremove $vg/$lv2
# Test attach while inactive, detach while inactive
# create fs on LV after writecache is attached
-lvcreate -n $lv1 -l 8 -an $vg "$dev1"
+lvcreate -n $lv1 -L 300 -an $vg "$dev1"
lvcreate -n $lv2 -l 4 -an $vg "$dev2"
lvconvert --yes --type writecache --cachevol $lv2 $vg/$lv1
check lv_field $vg/$lv1 segtype writecache
@@ -221,7 +221,7 @@ lvremove $vg/$lv2
# Test attach while active, detach while active
-lvcreate -n $lv1 -l 8 -an $vg "$dev1"
+lvcreate -n $lv1 -L 300 -an $vg "$dev1"
lvcreate -n $lv2 -l 4 -an $vg "$dev2"
lvchange -ay $vg/$lv1
_add_new_data_to_mnt
@@ -246,7 +246,7 @@ lvremove $vg/$lv2
# Test attach while active, detach while active,
# skip cleaner so flush message is used instead
-lvcreate -n $lv1 -l 8 -an $vg "$dev1"
+lvcreate -n $lv1 -L 300 -an $vg "$dev1"
lvcreate -n $lv2 -l 4 -an $vg "$dev2"
lvchange -ay $vg/$lv1
_add_new_data_to_mnt
@@ -268,6 +268,5 @@ lvchange -an $vg/$lv2
_verify_data_on_lv
lvremove $vg/$lv1
lvremove $vg/$lv2
-
+
vgremove -ff $vg
-
1 year, 7 months
main - tests: use conv=fdatasync
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6990cbc16659aa8b81c...
Commit: 6990cbc16659aa8b81cb0cd40728cebe8d1d4839
Parent: 9f3997734480deaae8cb195c4c30bff1e2cfc463
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Sep 6 18:47:03 2022 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 7 15:00:15 2022 +0200
tests: use conv=fdatasync
When we only need wait for result - avoid using slow 'oflag=sync'
with virtual layers
---
test/shell/integrity-blocksize.sh | 8 ++++----
test/shell/writecache-large.sh | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/test/shell/integrity-blocksize.sh b/test/shell/integrity-blocksize.sh
index bf8def4ac..4e47ce427 100644
--- a/test/shell/integrity-blocksize.sh
+++ b/test/shell/integrity-blocksize.sh
@@ -53,10 +53,10 @@ trap 'cleanup_mounted_and_teardown' EXIT
#truncate -s 64M loopc
#truncate -s 64M loopd
-dd if=/dev/zero of=loopa bs=1M count=64 oflag=sync
-dd if=/dev/zero of=loopb bs=1M count=64 oflag=sync
-dd if=/dev/zero of=loopc bs=1M count=64 oflag=sync
-dd if=/dev/zero of=loopd bs=1M count=64 oflag=sync
+dd if=/dev/zero of=loopa bs=1M count=64 conv=fdatasync
+dd if=/dev/zero of=loopb bs=1M count=64 conv=fdatasync
+dd if=/dev/zero of=loopc bs=1M count=64 conv=fdatasync
+dd if=/dev/zero of=loopd bs=1M count=64 conv=fdatasync
LOOP1=$(losetup -f loopa --show) || skip "Cannot find free loop device"
LOOP2=$(losetup -f loopb --show) || skip "Cannot find free loop device"
diff --git a/test/shell/writecache-large.sh b/test/shell/writecache-large.sh
index 9a5a9f1dd..6391cef49 100644
--- a/test/shell/writecache-large.sh
+++ b/test/shell/writecache-large.sh
@@ -130,10 +130,10 @@ _add_new_data_to_mnt
_add_more_data_to_mnt
_verify_data_on_mnt
-dd if=/dev/zero of=$mnt/big1 bs=1M count=100 oflag=sync
-dd if=/dev/zero of=$mnt/big2 bs=1M count=100 oflag=sync
-dd if=/dev/zero of=$mnt/big3 bs=1M count=100 oflag=sync
-dd if=/dev/zero of=$mnt/big4 bs=1M count=100 oflag=sync
+dd if=/dev/zero of=$mnt/big1 bs=1M count=100 conv=fdatasync
+dd if=/dev/zero of=$mnt/big2 bs=1M count=100 conv=fdatasync
+dd if=/dev/zero of=$mnt/big3 bs=1M count=100 conv=fdatasync
+dd if=/dev/zero of=$mnt/big4 bs=1M count=100 conv=fdatasync
lvconvert --splitcache $vg/$lv1
check lv_field $vg/$lv1 segtype linear
@@ -159,7 +159,7 @@ lvconvert --yes --type writecache --cachevol $lv2 $vg/$lv1
_add_new_data_to_mnt
_add_more_data_to_mnt
-dd if=/dev/zero of=$mnt/big1 bs=1M count=100 oflag=sync
+dd if=/dev/zero of=$mnt/big1 bs=1M count=100 conv=fdatasync
umount $mnt
lvchange -an $vg/$lv1
1 year, 7 months
main - tests: add /dev requirement
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9f3997734480deaae8c...
Commit: 9f3997734480deaae8cb195c4c30bff1e2cfc463
Parent: 0ed3f7a1bf7d9a7a144526048e44dd19c29fcfed
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Sep 6 18:00:28 2022 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 7 15:00:15 2022 +0200
tests: add /dev requirement
This test could only be run when user passes LVM_TEST_DEVDIR=/dev
as it requires and expects actions to be going in this dir, skip
otherwise.
Also 'extend_filter' manages multiple args in on lvm.conf update.
---
test/shell/vgchange-pvs-online.sh | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/test/shell/vgchange-pvs-online.sh b/test/shell/vgchange-pvs-online.sh
index 9bcf70e4b..8812de1a3 100644
--- a/test/shell/vgchange-pvs-online.sh
+++ b/test/shell/vgchange-pvs-online.sh
@@ -22,24 +22,19 @@ aux prepare_devs 4
# skip rhel5 which doesn't seem to have /dev/mapper/LVMTESTpv1
aux driver_at_least 4 15 || skip
+test "$DM_DEV_DIR" = "/dev" || skip "Only works with /dev access -> make check LVM_TEST_DEVDIR=/dev"
+
DFDIR="$LVM_SYSTEM_DIR/devices"
mkdir -p "$DFDIR" || true
DF="$DFDIR/system.devices"
# Because mapping devno to devname gets dm name from sysfs
aux lvmconf 'devices/scan = "/dev"'
-base1=$(basename $dev1)
-base2=$(basename $dev2)
-base3=$(basename $dev3)
-base4=$(basename $dev4)
-bd1=/dev/mapper/$base1
-bd2=/dev/mapper/$base2
-bd3=/dev/mapper/$base3
-bd4=/dev/mapper/$base4
-aux extend_filter "a|/dev/mapper/$base1|"
-aux extend_filter "a|/dev/mapper/$base2|"
-aux extend_filter "a|/dev/mapper/$base3|"
-aux extend_filter "a|/dev/mapper/$base4|"
+bd1="/dev/mapper/$(basename $dev1)"
+bd2="/dev/mapper/$(basename $dev2)"
+bd3="/dev/mapper/$(basename $dev3)"
+bd4="/dev/mapper/$(basename $dev4)"
+aux extend_filter "a|$bd1|" "a|$bd2|" "a|$bd3|" "a|$bd4|"
# Changing names will confuse df based on devname
if lvmdevices; then
1 year, 7 months
main - tests: add thin requirement
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0ed3f7a1bf7d9a7a144...
Commit: 0ed3f7a1bf7d9a7a144526048e44dd19c29fcfed
Parent: 1a3e773f37483b30f1bd1c1406ffc2f0b1e00631
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Tue Sep 6 17:59:25 2022 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 7 15:00:15 2022 +0200
tests: add thin requirement
---
test/shell/report-format.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/test/shell/report-format.sh b/test/shell/report-format.sh
index 07fa02778..399ed0337 100644
--- a/test/shell/report-format.sh
+++ b/test/shell/report-format.sh
@@ -15,6 +15,8 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
+aux have_thin 1 0 0 || skip
+
aux prepare_vg 1
OUT_LOG_FILE="out"
1 year, 7 months
main - tests: lvextend update for 300M XFS
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1a3e773f37483b30f1b...
Commit: 1a3e773f37483b30f1bd1c1406ffc2f0b1e00631
Parent: afcf954491416dab5845d25dc45c53c3e8000773
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Aug 31 14:30:01 2022 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 7 15:00:15 2022 +0200
tests: lvextend update for 300M XFS
---
test/shell/lvextend-caches-on-thindata.sh | 12 ++++++------
test/shell/lvextend-caches.sh | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/test/shell/lvextend-caches-on-thindata.sh b/test/shell/lvextend-caches-on-thindata.sh
index ef47d76d0..35b70546f 100644
--- a/test/shell/lvextend-caches-on-thindata.sh
+++ b/test/shell/lvextend-caches-on-thindata.sh
@@ -116,11 +116,11 @@ which mkfs.xfs || skip
mount_dir="mnt"
mkdir -p "$mount_dir"
-aux prepare_devs 6 70 # want 64M of usable space from each dev
+aux prepare_devs 6 400 # want 400M of usable space from each dev
# Tests with fs block sizes require a libblkid version that shows BLOCK_SIZE
vgcreate $vg "$dev1"
-lvcreate -n $lv1 -L50 $vg
+lvcreate -n $lv1 -L300 $vg
mkfs.xfs -f "$DM_DEV_DIR/$vg/$lv1"
blkid -c /dev/null "$DM_DEV_DIR/$vg/$lv1" | grep BLOCK_SIZE || skip
lvchange -an $vg
@@ -141,7 +141,7 @@ vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6"
# lv3 is thin LV: 1G
# attach writecache to thinpool data
-lvcreate --type thin-pool -n $lv1 -L128M --poolmetadataspare n $vg "$dev1" "$dev2"
+lvcreate --type thin-pool -n $lv1 -L228M --poolmetadataspare n $vg "$dev1" "$dev2"
lvcreate --type thin -n $lv3 -V1G --thinpool $lv1 $vg
lvcreate -n $lv2 -L64M -an $vg "$dev3"
lvconvert -y --type writecache --cachevol $lv2 $vg/$lv1
@@ -149,7 +149,7 @@ lvs -a $vg -o+devices
do_test $lv1 $lv3
# attach cache/writeback (cachevol) to thinpool data
-lvcreate --type thin-pool -n $lv1 -L128M --poolmetadataspare n $vg "$dev1" "$dev2"
+lvcreate --type thin-pool -n $lv1 -L228M --poolmetadataspare n $vg "$dev1" "$dev2"
lvcreate --type thin -n $lv3 -V1G --thinpool $lv1 $vg
lvcreate -n $lv2 -L64M -an $vg "$dev3"
lvconvert -y --type cache --cachevol $lv2 --cachemode writeback $vg/$lv1
@@ -157,7 +157,7 @@ lvs -a $vg -o+devices
do_test $lv1 $lv3
# attach cache/writethrough (cachevol) to thinpool data
-lvcreate --type thin-pool -n $lv1 -L128M --poolmetadataspare n $vg "$dev1" "$dev2"
+lvcreate --type thin-pool -n $lv1 -L228M --poolmetadataspare n $vg "$dev1" "$dev2"
lvcreate --type thin -n $lv3 -V1G --thinpool $lv1 $vg
lvcreate -n $lv2 -L64M -an $vg "$dev3"
lvconvert -y --type cache --cachevol $lv2 --cachemode writethrough $vg/$lv1
@@ -165,7 +165,7 @@ lvs -a $vg -o+devices
do_test $lv1 $lv3
# attach cache (cachepool) to thinpool data
-lvcreate --type thin-pool -n $lv1 -L128M --poolmetadataspare n $vg "$dev1" "$dev2"
+lvcreate --type thin-pool -n $lv1 -L228M --poolmetadataspare n $vg "$dev1" "$dev2"
lvcreate --type thin -n $lv3 -V1G --thinpool $lv1 $vg
lvcreate -y --type cache-pool -n $lv2 -L64M --poolmetadataspare n $vg "$dev3" "$dev6"
lvconvert -y --type cache --cachepool $lv2 --poolmetadataspare n $vg/$lv1
diff --git a/test/shell/lvextend-caches.sh b/test/shell/lvextend-caches.sh
index de9af6d2c..f2768903f 100644
--- a/test/shell/lvextend-caches.sh
+++ b/test/shell/lvextend-caches.sh
@@ -108,7 +108,7 @@ which mkfs.xfs || skip
mount_dir="mnt"
mkdir -p "$mount_dir"
-aux prepare_devs 6 66 # want 64M of usable space from each dev
+aux prepare_devs 6 200 # want 200M of usable space from each dev
# generate random data
dd if=/dev/urandom of=pattern bs=512K count=1
@@ -119,28 +119,28 @@ vgcreate $SHARED $vg "$dev1" "$dev2" "$dev3" "$dev4" "$dev5" "$dev6"
# cache with cachepool|cachevol
# cache with writeback|writethrough
-# lv1 is main LV: 128M
+# lv1 is main LV: 300M
# lv2 is fast LV: 64M
-lvcreate -n $lv1 -L128M -an $vg "$dev1" "$dev2"
+lvcreate -n $lv1 -L300M -an $vg "$dev1" "$dev2"
lvcreate -n $lv2 -L64M -an $vg "$dev3"
lvconvert -y --type writecache --cachevol $lv2 $vg/$lv1
lvs -a $vg -o+devices
do_test
-lvcreate -n $lv1 -L128M -an $vg "$dev1" "$dev2"
+lvcreate -n $lv1 -L300M -an $vg "$dev1" "$dev2"
lvcreate -n $lv2 -L64M -an $vg "$dev3"
lvconvert -y --type cache --cachevol $lv2 --cachemode writeback $vg/$lv1
lvs -a $vg -o+devices
do_test
-lvcreate -n $lv1 -L128M -an $vg "$dev1" "$dev2"
+lvcreate -n $lv1 -L300M -an $vg "$dev1" "$dev2"
lvcreate -n $lv2 -L64M -an $vg "$dev3"
lvconvert -y --type cache --cachevol $lv2 --cachemode writethrough $vg/$lv1
lvs -a $vg -o+devices
do_test
-lvcreate -n $lv1 -L128M -an $vg "$dev1" "$dev2"
+lvcreate -n $lv1 -L300M -an $vg "$dev1" "$dev2"
lvcreate -y --type cache-pool -n $lv2 -L64M --poolmetadataspare n $vg "$dev3" "$dev6"
lvconvert -y --type cache --cachepool $lv2 --poolmetadataspare n $vg/$lv1
lvs -a $vg -o+devices
1 year, 7 months
main - tests: no caching for blkid in testing
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=afcf954491416dab584...
Commit: afcf954491416dab5845d25dc45c53c3e8000773
Parent: 80b782f86ffea19a9881b026df3dc133eebffbe5
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Aug 31 14:14:59 2022 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 7 15:00:15 2022 +0200
tests: no caching for blkid in testing
---
test/lib/lvm_vdo_wrapper.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/lib/lvm_vdo_wrapper.sh b/test/lib/lvm_vdo_wrapper.sh
index 90d0b2ce8..b1da2e35b 100755
--- a/test/lib/lvm_vdo_wrapper.sh
+++ b/test/lib/lvm_vdo_wrapper.sh
@@ -142,7 +142,7 @@ esac
test -n "${vdo_device-}" || vdo_die_ "VDO device is missing"
-blkid -s UUID -o value "${vdo_device}" || true
+blkid -c /dev/null -s UUID -o value "${vdo_device}" || true
devsize=$(blockdev --getsize64 "$vdo_device")
devsize=$(( devsize / 4096 )) # convert to 4KiB units
1 year, 7 months
main - tests: make damage optional
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=80b782f86ffea19a988...
Commit: 80b782f86ffea19a9881b026df3dc133eebffbe5
Parent: e1e05cf2b526fbd8689dca8b0b232f0b1ce8ed7c
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Aug 31 14:07:46 2022 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 7 15:00:15 2022 +0200
tests: make damage optional
Investigate how to damage thin-pool across different versions/platforms.
Until them - use 'should' for test result.
---
test/shell/lvconvert-repair-thin.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/test/shell/lvconvert-repair-thin.sh b/test/shell/lvconvert-repair-thin.sh
index 9b94cbfd2..0fb0d76ff 100644
--- a/test/shell/lvconvert-repair-thin.sh
+++ b/test/shell/lvconvert-repair-thin.sh
@@ -61,9 +61,10 @@ aux have_tool_at_least "$LVM_TEST_THIN_REPAIR_CMD" 0 3 1 || skip
# Make some 'repairable' damage??
dd if=/dev/zero of="$DM_DEV_DIR/$vg/repair" bs=1 seek=40960 count=1
-not "$LVM_TEST_THIN_CHECK_CMD" "$DM_DEV_DIR/$vg/repair"
+# Investige how to make such damage across different versions of thin-pool target.
+should not "$LVM_TEST_THIN_CHECK_CMD" "$DM_DEV_DIR/$vg/repair"
-not "$LVM_TEST_THIN_DUMP_CMD" "$DM_DEV_DIR/$vg/repair" | tee dump
+should not "$LVM_TEST_THIN_DUMP_CMD" "$DM_DEV_DIR/$vg/repair" | tee dump
"$LVM_TEST_THIN_REPAIR_CMD" -i "$DM_DEV_DIR/$vg/repair" -o "$DM_DEV_DIR/$vg/fixed"
1 year, 7 months
main - tests: check for at least 1G of RAM
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e1e05cf2b526fbd8689...
Commit: e1e05cf2b526fbd8689dca8b0b232f0b1ce8ed7c
Parent: a6e47a161240e977bac5522d85e92fff3c1c9026
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Aug 31 13:57:41 2022 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 7 15:00:15 2022 +0200
tests: check for at least 1G of RAM
This test requires quite some RAM to be there.
---
test/shell/lvconvert-raid-reshape.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/test/shell/lvconvert-raid-reshape.sh b/test/shell/lvconvert-raid-reshape.sh
index bc6eaa733..e55ab7ab9 100644
--- a/test/shell/lvconvert-raid-reshape.sh
+++ b/test/shell/lvconvert-raid-reshape.sh
@@ -20,6 +20,8 @@ LVM_SKIP_LARGE_TESTS=0
which mkfs.ext4 || skip
aux have_raid 1 14 0 || skip
+test "$(aux total_mem)" -gt 1048576 || skip "Not enough RAM for this test"
+
if [ $LVM_SKIP_LARGE_TESTS -eq 0 ]
then
aux prepare_pvs 65 9
1 year, 7 months
main - tests: remove slash
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a6e47a161240e977bac...
Commit: a6e47a161240e977bac5522d85e92fff3c1c9026
Parent: 8a92a526a0bd4f5c9f89a535ee8904143441f38e
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Aug 31 13:26:30 2022 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 7 15:00:15 2022 +0200
tests: remove slash
---
test/shell/lvchange-thin.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/shell/lvchange-thin.sh b/test/shell/lvchange-thin.sh
index 992ed7145..d9d261e4b 100644
--- a/test/shell/lvchange-thin.sh
+++ b/test/shell/lvchange-thin.sh
@@ -30,7 +30,7 @@ lvcreate -L10M -T $vg/pool
# tests for checking thin-pool discard passdown are skipped
pvmajor=$(get pv_field "$dev1" major)
pvminor=$(get pv_field "$dev1" minor)
-test "$(< "/sys/dev/block/$pvmajor\:$pvminor/queue/discard_granularity")" -ne 0 || \
+test "$(< "/sys/dev/block/$pvmajor:$pvminor/queue/discard_granularity")" -ne 0 || \
no_discard=1
#
1 year, 7 months
main - tests: skip this test for 5.19
by Zdenek Kabelac
Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8a92a526a0bd4f5c9f8...
Commit: 8a92a526a0bd4f5c9f89a535ee8904143441f38e
Parent: 15ad2b8e5585b89bc3f09a53567f17eb70f45714
Author: Zdenek Kabelac <zkabelac(a)redhat.com>
AuthorDate: Wed Sep 7 14:54:39 2022 +0200
Committer: Zdenek Kabelac <zkabelac(a)redhat.com>
CommitterDate: Wed Sep 7 15:00:15 2022 +0200
tests: skip this test for 5.19
mdraid has some breakage - so 5.19 is crashing
(possibly even some more older version - that can be added as well)
Test seems to pass with 6.0-rc kernel.
---
test/shell/lvconvert-raid-reshape-load.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/test/shell/lvconvert-raid-reshape-load.sh b/test/shell/lvconvert-raid-reshape-load.sh
index 14b5dfdde..29b8e4ca4 100644
--- a/test/shell/lvconvert-raid-reshape-load.sh
+++ b/test/shell/lvconvert-raid-reshape-load.sh
@@ -15,6 +15,10 @@ SKIP_WITH_LVMPOLLD=1
. lib/inittest
+case "$(uname -r)" in
+5.19*) skip "Skippen test that kills this kernel" ;;
+esac
+
# Test reshaping under io load
which mkfs.ext4 || skip
1 year, 7 months