lvm2-commits October 2019

lvm2-commits@lists.fedorahosted.org

6 participants
171 discussions

stable-2.02 - spec: Fix lvm2-activation-generator man page handling
by Marian Csontos 04 Oct '19

04 Oct '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=219c4c2ce2c605960ad76… Commit: 219c4c2ce2c605960ad760ac99be27b2665a8c43 Parent: 45ee63ede955d3188119d039faca26a159038f67 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Fri Oct 4 16:29:38 2019 +0200 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Fri Oct 4 16:32:52 2019 +0200 spec: Fix lvm2-activation-generator man page handling lvm2-activation-generator is not installed when systemd is not in the system. (cherry picked from commit b20b23dfc6bef6f0e468f8331b277e974d1fea12) Conflicts: spec/packages.inc --- spec/packages.inc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/spec/packages.inc b/spec/packages.inc index 7330a5f..14fc02c 100644 --- a/spec/packages.inc +++ b/spec/packages.inc @@ -108,7 +108,9 @@ fi %{_mandir}/man8/lvm-config.8.gz %{_mandir}/man8/lvm-dumpconfig.8.gz %{_mandir}/man8/lvm.8.gz -%{_mandir}/man8/lvm2-activation-generator.8.gz +%if %{enable_systemd} + %{_mandir}/man8/lvm2-activation-generator.8.gz +%endif %{_mandir}/man8/lvmconf.8.gz %{_mandir}/man8/lvmconfig.8.gz %{_mandir}/man8/lvmdiskscan.8.gz

1 0

master - spec: Fix lvm2-activation-generator man page handling
by Marian Csontos 04 Oct '19

04 Oct '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b20b23dfc6bef6f0e468f… Commit: b20b23dfc6bef6f0e468f8331b277e974d1fea12 Parent: d69304114948451c72b399346194af6ed4e10f9c Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Fri Oct 4 16:29:38 2019 +0200 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Fri Oct 4 16:29:38 2019 +0200 spec: Fix lvm2-activation-generator man page handling lvm2-activation-generator is not installed when systemd is not in the system. --- spec/packages.inc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/spec/packages.inc b/spec/packages.inc index cbddbd5..c0d3793 100644 --- a/spec/packages.inc +++ b/spec/packages.inc @@ -95,7 +95,9 @@ fi %{_mandir}/man8/lvm-config.8.gz %{_mandir}/man8/lvm-dumpconfig.8.gz %{_mandir}/man8/lvm.8.gz -%{_mandir}/man8/lvm2-activation-generator.8.gz +%if %{enable_systemd} + %{_mandir}/man8/lvm2-activation-generator.8.gz +%endif %{_mandir}/man8/lvmconfig.8.gz %{_mandir}/man8/lvmdiskscan.8.gz %{_mandir}/man8/lvmdump.8.gz

1 0

master - tests: add wipefs wrapper
by David Teigland 03 Oct '19

03 Oct '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d69304114948451c72b39… Commit: d69304114948451c72b399346194af6ed4e10f9c Parent: c2ff8876f97a5840cd9d6fcda1bec55ef6220dc3 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Oct 2 14:11:08 2019 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Oct 2 14:11:08 2019 -0500 tests: add wipefs wrapper which falls back to using dd on old systems without the wipefs command --- test/lib/aux.sh | 11 +++++++++ test/shell/allow-mixed-block-sizes.sh | 5 +-- test/shell/duplicate-pvs-md0.sh | 26 ++++++++++------------ test/shell/duplicate-pvs-md1.sh | 38 +++++++++++++++----------------- test/shell/lvm-on-md.sh | 14 +++++------- test/shell/pvcreate-operation-md.sh | 10 +++----- 6 files changed, 53 insertions(+), 51 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 3c7ee62..8ceb5db 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -797,6 +797,17 @@ wait_md_create() { echo "$md" > WAIT_MD_DEV } +wipefs_a() { + local dev=$1 + shift + + if wipefs -V >/dev/null; then + wipefs -a "$dev" + else + dd if=/dev/zero of="$dev" bs=1024 || true + fi +} + prepare_backing_dev() { local size=${1=32} shift diff --git a/test/shell/allow-mixed-block-sizes.sh b/test/shell/allow-mixed-block-sizes.sh index ec60bc6..b51232a 100644 --- a/test/shell/allow-mixed-block-sizes.sh +++ b/test/shell/allow-mixed-block-sizes.sh @@ -15,7 +15,6 @@ SKIP_WITH_LVMPOLLD=1 . lib/inittest losetup -h | grep sector-size || skip -wipefs -V || skip dd if=/dev/zero of=loopa bs=$((1024*1024)) count=2 2> /dev/null dd if=/dev/zero of=loopb bs=$((1024*1024)) count=2 2> /dev/null @@ -32,8 +31,8 @@ not vgcreate --config 'devices {allow_mixed_block_sizes=0 scan="/dev"}' $vg $LOO vgcreate --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg $LOOP1 $LOOP2 vgs --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg -wipefs -a $LOOP1 -wipefs -a $LOOP2 +aux wipefs_a $LOOP1 +aux wipefs_a $LOOP2 vgcreate --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg $LOOP1 vgs --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg diff --git a/test/shell/duplicate-pvs-md0.sh b/test/shell/duplicate-pvs-md0.sh index e3f453f..21f1442 100644 --- a/test/shell/duplicate-pvs-md0.sh +++ b/test/shell/duplicate-pvs-md0.sh @@ -28,8 +28,6 @@ _clear_online_files() { . lib/inittest -wipefs -V || skip - test -f /proc/mdstat && grep -q raid0 /proc/mdstat || \ modprobe raid0 || skip @@ -125,8 +123,8 @@ vgchange -an $vg vgremove -f $vg mdadm --stop "$mddev" aux udev_wait -wipefs -a "$dev1" -wipefs -a "$dev2" +aux wipefs_a "$dev1" +aux wipefs_a "$dev2" aux udev_wait @@ -197,8 +195,8 @@ vgchange -an $vg vgremove -f $vg mdadm --stop "$mddev" aux udev_wait -wipefs -a "$dev1" -wipefs -a "$dev2" +aux wipefs_a "$dev1" +aux wipefs_a "$dev2" aux udev_wait @@ -253,8 +251,8 @@ pvscan --cache -aay "$dev2" not ls "$RUNDIR/lvm/pvs_online/$PVIDMD" not ls "$RUNDIR/lvm/vgs_online/$vg" -wipefs -a "$dev1" -wipefs -a "$dev2" +aux wipefs_a "$dev1" +aux wipefs_a "$dev2" aux udev_wait ########################################## @@ -311,8 +309,8 @@ not ls "$RUNDIR/lvm/vgs_online/$vg" lvs -o active $vg |tee out || true not grep "active" out -wipefs -a "$dev1" -wipefs -a "$dev2" +aux wipefs_a "$dev1" +aux wipefs_a "$dev2" aux udev_wait @@ -372,8 +370,8 @@ cat /proc/mdstat # for some reason enabling dev2 starts an odd md dev mdadm --stop "$mddev" || true cat /proc/mdstat -wipefs -a "$dev1" || true -wipefs -a "$dev2" || true +aux wipefs_a "$dev1" || true +aux wipefs_a "$dev2" || true aux udev_wait ########################################## @@ -437,6 +435,6 @@ cat /proc/mdstat # for some reason enabling dev2 starts an odd md dev mdadm --stop "$mddev" || true cat /proc/mdstat -wipefs -a "$dev1" || true -wipefs -a "$dev2" || true +aux wipefs_a "$dev1" || true +aux wipefs_a "$dev2" || true aux udev_wait diff --git a/test/shell/duplicate-pvs-md1.sh b/test/shell/duplicate-pvs-md1.sh index a642c55..be223df 100644 --- a/test/shell/duplicate-pvs-md1.sh +++ b/test/shell/duplicate-pvs-md1.sh @@ -33,8 +33,6 @@ _clear_online_files() { . lib/inittest -wipefs -V || skip - test -f /proc/mdstat && grep -q raid1 /proc/mdstat || \ modprobe raid1 || skip @@ -130,8 +128,8 @@ vgchange -an $vg vgremove -f $vg mdadm --stop "$mddev" aux udev_wait -wipefs -a "$dev1" -wipefs -a "$dev2" +aux wipefs_a "$dev1" +aux wipefs_a "$dev2" aux udev_wait @@ -216,8 +214,8 @@ vgchange -an $vg vgremove -f $vg mdadm --stop "$mddev" aux udev_wait -wipefs -a "$dev1" -wipefs -a "$dev2" +aux wipefs_a "$dev1" +aux wipefs_a "$dev2" aux udev_wait @@ -272,8 +270,8 @@ pvscan --cache -aay "$dev2" not ls "$RUNDIR/lvm/pvs_online/$PVIDMD" not ls "$RUNDIR/lvm/vgs_online/$vg" -wipefs -a "$dev1" -wipefs -a "$dev2" +aux wipefs_a "$dev1" +aux wipefs_a "$dev2" aux udev_wait @@ -340,8 +338,8 @@ not pvscan --cache -aay "$dev1" ls "$RUNDIR/lvm/pvs_online/$PVIDMD" ls "$RUNDIR/lvm/vgs_online/$vg" -wipefs -a "$dev1" || true -wipefs -a "$dev2" || true +aux wipefs_a "$dev1" || true +aux wipefs_a "$dev2" || true ########################################## @@ -419,8 +417,8 @@ cat /proc/mdstat # for some reason enabling dev2 starts an odd md dev mdadm --stop "$mddev" || true cat /proc/mdstat -wipefs -a "$dev1" || true -wipefs -a "$dev2" || true +aux wipefs_a "$dev1" || true +aux wipefs_a "$dev2" || true ########################################## # PV on an md raid1 device, auto+stopped @@ -483,8 +481,8 @@ cat /proc/mdstat # for some reason enabling dev2 starts an odd md dev mdadm --stop "$mddev" || true cat /proc/mdstat -wipefs -a "$dev1" || true -wipefs -a "$dev2" || true +aux wipefs_a "$dev1" || true +aux wipefs_a "$dev2" || true ########################################## @@ -545,9 +543,9 @@ pvscan --cache -aay "$dev4" not ls "$RUNDIR/lvm/pvs_online/$PVIDMD" not ls "$RUNDIR/lvm/vgs_online/$vg" -wipefs -a "$dev1" -wipefs -a "$dev2" -wipefs -a "$dev4" +aux wipefs_a "$dev1" +aux wipefs_a "$dev2" +aux wipefs_a "$dev4" aux udev_wait @@ -621,7 +619,7 @@ cat /proc/mdstat # for some reason enabling dev2 starts an odd md dev mdadm --stop "$mddev" || true cat /proc/mdstat -wipefs -a "$dev1" || true -wipefs -a "$dev2" || true -wipefs -a "$dev4" || true +aux wipefs_a "$dev1" || true +aux wipefs_a "$dev2" || true +aux wipefs_a "$dev4" || true diff --git a/test/shell/lvm-on-md.sh b/test/shell/lvm-on-md.sh index 726adf2..910ebc7 100644 --- a/test/shell/lvm-on-md.sh +++ b/test/shell/lvm-on-md.sh @@ -28,8 +28,6 @@ _clear_online_files() { . lib/inittest -wipefs -V || skip - test -f /proc/mdstat && grep -q raid1 /proc/mdstat || \ modprobe raid1 || skip @@ -168,8 +166,8 @@ vgremove -f $vg mdadm --stop "$mddev" aux udev_wait -wipefs -a "$dev1" -wipefs -a "$dev2" +aux wipefs_a "$dev1" +aux wipefs_a "$dev2" aux udev_wait @@ -293,8 +291,8 @@ vgremove -f $vg mdadm --stop "$mddev" aux udev_wait -wipefs -a "$dev1" -wipefs -a "$dev2" +aux wipefs_a "$dev1" +aux wipefs_a "$dev2" aux udev_wait @@ -461,7 +459,7 @@ vgremove -f $vg mdadm --stop "$mddev" aux udev_wait -wipefs -a "$dev1" -wipefs -a "$dev2" +aux wipefs_a "$dev1" +aux wipefs_a "$dev2" aux udev_wait diff --git a/test/shell/pvcreate-operation-md.sh b/test/shell/pvcreate-operation-md.sh index 49edf4c..f4b2a0d 100644 --- a/test/shell/pvcreate-operation-md.sh +++ b/test/shell/pvcreate-operation-md.sh @@ -18,8 +18,6 @@ SKIP_WITH_LVMPOLLD=1 # skip this test if mdadm or sfdisk (or others) aren't available which sfdisk || skip -wipefs -V || skip - test -f /proc/mdstat && grep -q raid0 /proc/mdstat || \ modprobe raid0 || skip mddev="/dev/md33" @@ -115,8 +113,8 @@ fi mdadm --stop "$mddev" aux udev_wait -wipefs -a "$dev1" -wipefs -a "$dev2" +aux wipefs_a "$dev1" +aux wipefs_a "$dev2" aux udev_wait # Test newer topology-aware alignment detection w/ --dataalignment override @@ -142,8 +140,8 @@ if aux kernel_at_least 2 6 33 ; then mdadm --stop "$mddev" aux udev_wait - wipefs -a "$dev1" - wipefs -a "$dev2" + aux wipefs_a "$dev1" + aux wipefs_a "$dev2" aux udev_wait fi

1 0

master - tests: update to md dev name
by David Teigland 03 Oct '19

03 Oct '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c2ff8876f97a5840cd9d6… Commit: c2ff8876f97a5840cd9d6fcda1bec55ef6220dc3 Parent: b138a87f43bcfdd3f523556d54f0a482ecf8c40b Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Oct 2 12:51:17 2019 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Oct 2 14:09:51 2019 -0500 tests: update to md dev name Use /dev/md33 instead of /dev/md0 to reduce chances of conflicting with an existing name. Only call 'mdadm --stop /dev/md33' for cleanup and don't use 'mdadm --stop --scan' to avoid stopping other md devs. --- test/lib/aux.sh | 7 +++++-- test/shell/duplicate-pvs-md0.sh | 12 +++--------- test/shell/duplicate-pvs-md1.sh | 15 +++------------ test/shell/lvm-on-md.sh | 7 +++---- test/shell/pvcreate-operation-md.sh | 5 ++--- 5 files changed, 16 insertions(+), 30 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 7b0ef22..3c7ee62 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -421,13 +421,15 @@ teardown_devs() { teardown_udev_cookies test ! -f MD_DEV || cleanup_md_dev + + test ! -f WAIT_MD_DEV || mddev=$(< WAIT_MD_DEV) udev_wait - mdadm --stop --scan || true + test ! -f WAIT_MD_DEV || mdadm --stop $mddev || true udev_wait test ! -f DEVICES || teardown_devs_prefixed "$PREFIX" test ! -f RAMDISK || { modprobe -r brd || true ; } - mdadm --stop --scan || true + test ! -f WAIT_MD_DEV || mdadm --stop $mddev || true # NOTE: SCSI_DEBUG_DEV test must come before the LOOP test because # prepare_scsi_debug_dev() also sets LOOP to short-circuit prepare_loop() @@ -792,6 +794,7 @@ wait_md_create() { break fi done + echo "$md" > WAIT_MD_DEV } prepare_backing_dev() { diff --git a/test/shell/duplicate-pvs-md0.sh b/test/shell/duplicate-pvs-md0.sh index d5164ce..e3f453f 100644 --- a/test/shell/duplicate-pvs-md0.sh +++ b/test/shell/duplicate-pvs-md0.sh @@ -32,7 +32,9 @@ wipefs -V || skip test -f /proc/mdstat && grep -q raid0 /proc/mdstat || \ modprobe raid0 || skip -not grep md0 /proc/mdstat || skip + +mddev="/dev/md33" +not grep $mddev /proc/mdstat || skip aux lvmconf 'devices/md_component_detection = 1' @@ -64,7 +66,6 @@ pvcreate "$dev3" aux lvmconf 'devices/md_component_checks = "auto"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 0 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -137,7 +138,6 @@ aux udev_wait aux lvmconf 'devices/md_component_checks = "start"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 0 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -210,7 +210,6 @@ aux udev_wait aux lvmconf 'devices/md_component_checks = "auto"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 0 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -266,7 +265,6 @@ aux udev_wait aux lvmconf 'devices/md_component_checks = "start"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 0 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -327,7 +325,6 @@ aux udev_wait aux lvmconf 'devices/md_component_checks = "start"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 0 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -374,7 +371,6 @@ aux aux udev_wait cat /proc/mdstat # for some reason enabling dev2 starts an odd md dev mdadm --stop "$mddev" || true -mdadm --stop --scan cat /proc/mdstat wipefs -a "$dev1" || true wipefs -a "$dev2" || true @@ -389,7 +385,6 @@ aux udev_wait aux lvmconf 'devices/md_component_checks = "auto"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 0 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -441,7 +436,6 @@ aux aux udev_wait cat /proc/mdstat # for some reason enabling dev2 starts an odd md dev mdadm --stop "$mddev" || true -mdadm --stop --scan cat /proc/mdstat wipefs -a "$dev1" || true wipefs -a "$dev2" || true diff --git a/test/shell/duplicate-pvs-md1.sh b/test/shell/duplicate-pvs-md1.sh index 334ac41..a642c55 100644 --- a/test/shell/duplicate-pvs-md1.sh +++ b/test/shell/duplicate-pvs-md1.sh @@ -37,7 +37,9 @@ wipefs -V || skip test -f /proc/mdstat && grep -q raid1 /proc/mdstat || \ modprobe raid1 || skip -not grep md0 /proc/mdstat || skip + +mddev="/dev/md33" +not grep $mddev /proc/mdstat || skip aux lvmconf 'devices/md_component_detection = 1' @@ -69,7 +71,6 @@ pvcreate "$dev3" aux lvmconf 'devices/md_component_checks = "auto"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 1 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -143,7 +144,6 @@ aux udev_wait aux lvmconf 'devices/md_component_checks = "start"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 1 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -229,7 +229,6 @@ aux udev_wait aux lvmconf 'devices/md_component_checks = "auto"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 1 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -294,7 +293,6 @@ aux udev_wait aux lvmconf 'devices/md_component_checks = "start"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 1 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -363,7 +361,6 @@ wipefs -a "$dev2" || true aux lvmconf 'devices/md_component_checks = "start"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 1 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -421,7 +418,6 @@ aux udev_wait cat /proc/mdstat # for some reason enabling dev2 starts an odd md dev mdadm --stop "$mddev" || true -mdadm --stop --scan cat /proc/mdstat wipefs -a "$dev1" || true wipefs -a "$dev2" || true @@ -435,7 +431,6 @@ wipefs -a "$dev2" || true aux lvmconf 'devices/md_component_checks = "auto"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 1 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -487,7 +482,6 @@ aux udev_wait cat /proc/mdstat # for some reason enabling dev2 starts an odd md dev mdadm --stop "$mddev" || true -mdadm --stop --scan cat /proc/mdstat wipefs -a "$dev1" || true wipefs -a "$dev2" || true @@ -502,7 +496,6 @@ wipefs -a "$dev2" || true aux lvmconf 'devices/md_component_checks = "auto"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 1 --chunk=64 --raid-devices=3 "$dev1" "$dev2" "$dev4" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -567,7 +560,6 @@ aux udev_wait aux lvmconf 'devices/md_component_checks = "start"' -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 1 --chunk=64 --raid-devices=3 "$dev1" "$dev2" "$dev4" aux wait_md_create "$mddev" pvcreate "$mddev" @@ -628,7 +620,6 @@ aux udev_wait cat /proc/mdstat # for some reason enabling dev2 starts an odd md dev mdadm --stop "$mddev" || true -mdadm --stop --scan cat /proc/mdstat wipefs -a "$dev1" || true wipefs -a "$dev2" || true diff --git a/test/shell/lvm-on-md.sh b/test/shell/lvm-on-md.sh index a8df814..726adf2 100644 --- a/test/shell/lvm-on-md.sh +++ b/test/shell/lvm-on-md.sh @@ -32,7 +32,9 @@ wipefs -V || skip test -f /proc/mdstat && grep -q raid1 /proc/mdstat || \ modprobe raid1 || skip -not grep md0 /proc/mdstat || skip + +mddev="/dev/md33" +not grep $mddev /proc/mdstat || skip aux lvmconf 'devices/md_component_detection = 1' @@ -52,7 +54,6 @@ aux prepare_devs 3 # create 2 disk MD raid1 array # by default using metadata format 1.0 with data at the end of device -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 1 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" vgcreate $vg "$mddev" @@ -177,7 +178,6 @@ aux udev_wait # When a raid0 md array is stopped, the components will not look like # duplicate PVs as they do with raid1. -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 0 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" vgcreate $vg "$mddev" @@ -308,7 +308,6 @@ aux lvmconf 'devices/obtain_device_list_from_udev = 1' # When a raid0 md array is stopped, the components will not look like # duplicate PVs as they do with raid1. -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 0 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" diff --git a/test/shell/pvcreate-operation-md.sh b/test/shell/pvcreate-operation-md.sh index 6e43e5f..49edf4c 100644 --- a/test/shell/pvcreate-operation-md.sh +++ b/test/shell/pvcreate-operation-md.sh @@ -22,7 +22,8 @@ wipefs -V || skip test -f /proc/mdstat && grep -q raid0 /proc/mdstat || \ modprobe raid0 || skip -not grep md0 /proc/mdstat || skip +mddev="/dev/md33" +not grep $mddev /proc/mdstat || skip aux lvmconf 'devices/md_component_detection = 1' aux extend_filter_md "a|/dev/md|" @@ -30,7 +31,6 @@ aux extend_filter_md "a|/dev/md|" aux prepare_devs 2 # create 2 disk MD raid0 array (stripe_width=128K) -mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 0 --chunk=64 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" @@ -122,7 +122,6 @@ aux udev_wait # Test newer topology-aware alignment detection w/ --dataalignment override if aux kernel_at_least 2 6 33 ; then - mddev="/dev/md0" mdadm --create --metadata=1.0 "$mddev" --level 0 --chunk=1024 --raid-devices=2 "$dev1" "$dev2" aux wait_md_create "$mddev" pvdev="$mddev"

1 0

stable-2.02 - WHATS_NEW: new lvextend-raid.sh test
by Heinz Mauelshagen 02 Oct '19

02 Oct '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=45ee63ede955d3188119d… Commit: 45ee63ede955d3188119d039faca26a159038f67 Parent: 8632aa5fd371b9a2dc1996a65135b35e9c006036 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Wed Oct 2 17:06:22 2019 +0200 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Wed Oct 2 17:06:22 2019 +0200 WHATS_NEW: new lvextend-raid.sh test --- WHATS_NEW | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 80ba83d..a157986 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.187 - =================================== + Add lvextend-raid.sh to check on RaidLV extensions synchronization. Fix lvmetad shutdown and avoid lenghty timeouts when rebooting system. Prevent creating VGs with PVs with different logical block sizes. Pvmove runs in exlusively activating mode for exclusively active LVs.

1 0

stable-2.02 - test: increase size of raid10 LV allowing tests to succeed on fast storage
by Heinz Mauelshagen 02 Oct '19

02 Oct '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8632aa5fd371b9a2dc199… Commit: 8632aa5fd371b9a2dc1996a65135b35e9c006036 Parent: a0b30eadd14ec3cc0f47f8d5cddd3026ffe08b31 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Wed Oct 2 14:59:17 2019 +0200 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Wed Oct 2 17:03:52 2019 +0200 test: increase size of raid10 LV allowing tests to succeed on fast storage Also add health char check. --- test/shell/lvchange-rebuild-raid.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/shell/lvchange-rebuild-raid.sh b/test/shell/lvchange-rebuild-raid.sh index 22acb92..d2bb723 100644 --- a/test/shell/lvchange-rebuild-raid.sh +++ b/test/shell/lvchange-rebuild-raid.sh @@ -43,8 +43,8 @@ done ############################################## # Create an 8-way striped raid10 with 4 mirror # groups and rebuild selected PVs. -lvcreate --type raid10 -m 1 -i 4 -l 2 -n $lv1 $vg -_sync +lvcreate --type raid10 -m 1 -i 4 -l 64 -n $lv1 $vg +_sync "AAAAAAAA" # Rebuild 1st and 2nd device would rebuild a # whole mirror group and needs to be rejected.

1 0

stable-2.02 - test: add RAID lvextend resynchronization test
by Heinz Mauelshagen 02 Oct '19

02 Oct '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a0b30eadd14ec3cc0f47f… Commit: a0b30eadd14ec3cc0f47f8d5cddd3026ffe08b31 Parent: a087da2f51e2b455a056bcf0550cb02a65d40a53 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Wed Oct 2 14:54:00 2019 +0200 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Wed Oct 2 17:03:51 2019 +0200 test: add RAID lvextend resynchronization test Due to a dm-raid target flaw fixed in target version 1.15.0, extents of raid sets don't get resynchronized when new MD bitmp pages have to be allocated due to the extension. Introduce lvextend-raid.sh to test this flaw. Related: rhbz1671964 --- test/shell/lvextend-raid.sh | 65 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/test/shell/lvextend-raid.sh b/test/shell/lvextend-raid.sh new file mode 100644 index 0000000..8988411 --- /dev/null +++ b/test/shell/lvextend-raid.sh @@ -0,0 +1,65 @@ +#!/usr/bin/env bash + +# Copyright (C) 2019 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# 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 + +v1_15_0=0 +aux have_raid 1 15 0 && v1_15_0=1 + +# Use smallest regionsize to save VG space +regionsize=`getconf PAGESIZE` # in bytes +let pageregions=regionsize*8 # number of regions per MD bitmap page + +# in KiB +let regionsize=regionsize/1024 + +# in MiB +let lvsz=pageregions*regionsize/1024 +let lvext=lvsz/8 + +aux prepare_pvs 2 $(($lvsz + 3 * $lvext)) +get_devs +vgcreate -s 4k $vg ${DEVICES[@]} + +aux delay_dev "$dev1" 0 50 + +# Create raid1 LV consuming 1 MD bitmap page +lvcreate --yes --type raid1 --regionsize ${regionsize}K -L$(($lvsz-$lvext))M -n $lv1 $vg +not check lv_field $vg/$lv1 sync_percent "100.00" +check lv_field $vg/$lv1 size "$(($lvsz-$lvext)).00m" $vg/$lv1 +aux wait_for_sync $vg $lv1 +check lv_field $vg/$lv1 sync_percent "100.00" +check lv_field $vg/$lv1 region_size "4.00k" + +# Extend so that full MD bitmap page is consumed +lvextend -y -L+${lvext}M $vg/$lv1 +not check lv_field $vg/$lv1 sync_percent "100.00" +check lv_field $vg/$lv1 size "$(($lvsz)).00m" $vg/$lv1 +aux wait_for_sync $vg $lv1 +check lv_field $vg/$lv1 sync_percent "100.00" + +# Extend so that another MD bitmap page is allocated +lvextend -y -L+${lvext}M $vg/$lv1 +if [ $v1_15_0 -eq 1 ] +then + not check lv_field $vg/$lv1 sync_percent "100.00" +else + check lv_field $vg/$lv1 sync_percent "100.00" +fi +aux wait_for_sync $vg $lv1 +check lv_field $vg/$lv1 sync_percent "100.00" +check lv_field $vg/$lv1 size "$(($lvsz+$lvext)).00m" $vg/$lv1 + +vgremove -ff $vg

1 0

stable-2.02 - test: add checks for not 100% sync ratio after initiation of check/repair
by Heinz Mauelshagen 02 Oct '19

02 Oct '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a087da2f51e2b455a056b… Commit: a087da2f51e2b455a056bcf0550cb02a65d40a53 Parent: 1f970f590f969d5a3d8b9d458ae257bf93c00432 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Wed Oct 2 14:48:53 2019 +0200 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Wed Oct 2 17:03:49 2019 +0200 test: add checks for not 100% sync ratio after initiation of check/repair Related: rhbz1640630 --- test/shell/lvchange-raid.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/test/shell/lvchange-raid.sh b/test/shell/lvchange-raid.sh index 1972a68..3a9ed60 100644 --- a/test/shell/lvchange-raid.sh +++ b/test/shell/lvchange-raid.sh @@ -139,6 +139,7 @@ run_writemostly_check() { check lv_attr_bit health $vg/${lv}_rimage_1 "-" } + # run_syncaction_check <VG> <LV> run_syncaction_check() { local device @@ -183,17 +184,20 @@ run_syncaction_check() { # "check" should find discrepancies but not change them # 'lvs' should show results lvchange --syncaction check $vg/$lv + not lv_field $vg/$lv sync_percent "100.00" aux wait_for_sync $vg $lv check lv_attr_bit health $vg/$lv "m" not check lv_field $vg/$lv raid_mismatch_count "0" # "repair" will fix discrepancies lvchange --syncaction repair $vg/$lv + not lv_field $vg/$lv sync_percent "100.00" aux wait_for_sync $vg $lv # Final "check" should show no mismatches # 'lvs' should show results lvchange --syncaction check $vg/$lv + not lv_field $vg/$lv sync_percent "100.00" aux wait_for_sync $vg $lv check lv_attr_bit health $vg/$lv "-" check lv_field $vg/$lv raid_mismatch_count "0"

1 0

master - test: increase size of raid10 LV allowing tests to succeed on fast storage
by Heinz Mauelshagen 02 Oct '19

02 Oct '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b138a87f43bcfdd3f5235… Commit: b138a87f43bcfdd3f523556d54f0a482ecf8c40b Parent: 242e2dccc3ba9f4f465a539159269623a357fe72 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Wed Oct 2 14:59:17 2019 +0200 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Wed Oct 2 15:25:43 2019 +0200 test: increase size of raid10 LV allowing tests to succeed on fast storage Also add health char check. --- test/shell/lvchange-rebuild-raid.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/shell/lvchange-rebuild-raid.sh b/test/shell/lvchange-rebuild-raid.sh index 22acb92..d2bb723 100644 --- a/test/shell/lvchange-rebuild-raid.sh +++ b/test/shell/lvchange-rebuild-raid.sh @@ -43,8 +43,8 @@ done ############################################## # Create an 8-way striped raid10 with 4 mirror # groups and rebuild selected PVs. -lvcreate --type raid10 -m 1 -i 4 -l 2 -n $lv1 $vg -_sync +lvcreate --type raid10 -m 1 -i 4 -l 64 -n $lv1 $vg +_sync "AAAAAAAA" # Rebuild 1st and 2nd device would rebuild a # whole mirror group and needs to be rejected.

1 0

master - test: add RAID lvextend resynchronization test
by Heinz Mauelshagen 02 Oct '19

02 Oct '19

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=242e2dccc3ba9f4f465a5… Commit: 242e2dccc3ba9f4f465a539159269623a357fe72 Parent: c4aba47dd0ce47f9f72ae4bd05be03e264a91ca2 Author: Heinz Mauelshagen <heinzm(a)redhat.com> AuthorDate: Wed Oct 2 14:54:00 2019 +0200 Committer: Heinz Mauelshagen <heinzm(a)redhat.com> CommitterDate: Wed Oct 2 15:25:41 2019 +0200 test: add RAID lvextend resynchronization test Due to a dm-raid target flaw fixed in target version 1.15.0, extents of raid sets don't get resynchronized when new MD bitmp pages have to be allocated due to the extension. Introduce lvextend-raid.sh to test this flaw. Related: rhbz1671964 --- test/shell/lvextend-raid.sh | 65 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/test/shell/lvextend-raid.sh b/test/shell/lvextend-raid.sh new file mode 100644 index 0000000..8988411 --- /dev/null +++ b/test/shell/lvextend-raid.sh @@ -0,0 +1,65 @@ +#!/usr/bin/env bash + +# Copyright (C) 2019 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# 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 + +v1_15_0=0 +aux have_raid 1 15 0 && v1_15_0=1 + +# Use smallest regionsize to save VG space +regionsize=`getconf PAGESIZE` # in bytes +let pageregions=regionsize*8 # number of regions per MD bitmap page + +# in KiB +let regionsize=regionsize/1024 + +# in MiB +let lvsz=pageregions*regionsize/1024 +let lvext=lvsz/8 + +aux prepare_pvs 2 $(($lvsz + 3 * $lvext)) +get_devs +vgcreate -s 4k $vg ${DEVICES[@]} + +aux delay_dev "$dev1" 0 50 + +# Create raid1 LV consuming 1 MD bitmap page +lvcreate --yes --type raid1 --regionsize ${regionsize}K -L$(($lvsz-$lvext))M -n $lv1 $vg +not check lv_field $vg/$lv1 sync_percent "100.00" +check lv_field $vg/$lv1 size "$(($lvsz-$lvext)).00m" $vg/$lv1 +aux wait_for_sync $vg $lv1 +check lv_field $vg/$lv1 sync_percent "100.00" +check lv_field $vg/$lv1 region_size "4.00k" + +# Extend so that full MD bitmap page is consumed +lvextend -y -L+${lvext}M $vg/$lv1 +not check lv_field $vg/$lv1 sync_percent "100.00" +check lv_field $vg/$lv1 size "$(($lvsz)).00m" $vg/$lv1 +aux wait_for_sync $vg $lv1 +check lv_field $vg/$lv1 sync_percent "100.00" + +# Extend so that another MD bitmap page is allocated +lvextend -y -L+${lvext}M $vg/$lv1 +if [ $v1_15_0 -eq 1 ] +then + not check lv_field $vg/$lv1 sync_percent "100.00" +else + check lv_field $vg/$lv1 sync_percent "100.00" +fi +aux wait_for_sync $vg $lv1 +check lv_field $vg/$lv1 sync_percent "100.00" +check lv_field $vg/$lv1 size "$(($lvsz+$lvext)).00m" $vg/$lv1 + +vgremove -ff $vg

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits October 2019