lvm2-commits November 2021

lvm2-commits@lists.fedorahosted.org

1 participants
35 discussions

main - pvscan: limit md device_hint for slow autoactivation
by David Teigland 30 Nov '21

30 Nov '21

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=470b967bc5a66b3b066af… Commit: 470b967bc5a66b3b066af5694a10220be7a2a155 Parent: d12baba1a9bfe2d82537b20bc768758d84b263b6 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Nov 30 09:06:08 2021 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Nov 30 09:06:08 2021 -0600 pvscan: limit md device_hint for slow autoactivation The device_hint name in the metadata was meant to prevent autoactivation from md components, but the name checks were more general and would catch unnecessary cases. --- tools/pvscan.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/pvscan.c b/tools/pvscan.c index 0c25fb542..429b5e676 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -564,7 +564,8 @@ static int _get_devs_from_saved_vg(struct cmd_context *cmd, const char *vgname, name1 = dev_name(dev); name2 = pvl->pv->device_hint; - if (strcmp(name1, name2)) { + /* Probably pointless since dev is from online file which was already checked. */ + if (!strncmp(name2, "/dev/md", 7) && strncmp(name1, "/dev/md", 7)) { if (!id_write_format((const struct id *)pvid, uuidstr, sizeof(uuidstr))) uuidstr[0] = '\0'; log_print_pvscan(cmd, "PVID %s read from %s last written to %s.", uuidstr, name1, name2); @@ -1119,7 +1120,7 @@ static int _online_devs(struct cmd_context *cmd, int do_all, struct dm_list *pvs do_full_check = 0; /* If use_full_md_check is set then this has already been done by filter. */ - if (!cmd->use_full_md_check) { + if (!cmd->use_full_md_check && (cmd->dev_types->md_major != MAJOR(dev->dev))) { if (devsize && (pv->size != devsize)) do_full_check = 1; if (pv->device_hint && !strncmp(pv->device_hint, "/dev/md", 7))

1 0

main - pvscan: match device arg to filter symlink
by David Teigland 30 Nov '21

30 Nov '21

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d12baba1a9bfe2d82537b… Commit: d12baba1a9bfe2d82537b20bc768758d84b263b6 Parent: 009007484b88fb16e2177deaf4774d0e50576a06 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Nov 29 17:13:44 2021 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Nov 29 17:13:44 2021 -0600 pvscan: match device arg to filter symlink This fixes an issue related to the optimization in "pvscan: only add device args to dev cache" If the devices file is not used, and the lvm.conf filter accepts devices via symlink names, then those devices won't be accepted by pvscan for autoactivation. To resolve this, recognize when the filter contains symlinks and disable the optimization. When the optimization is disabled, a full dev_cache_scan is performed, and symlinks are associated with the device names passed to pvscan. filter-regex will accept a device if symlinks to that device are accepted. --- test/shell/udev-pvscan-vgchange.sh | 53 ++++++++++++++++++++++++++++++++ tools/pvscan.c | 63 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) diff --git a/test/shell/udev-pvscan-vgchange.sh b/test/shell/udev-pvscan-vgchange.sh index a82bf8876..a209dc048 100644 --- a/test/shell/udev-pvscan-vgchange.sh +++ b/test/shell/udev-pvscan-vgchange.sh @@ -381,8 +381,13 @@ BDEVMD=$(basename "$mddev") lvcreate -l1 -an -n $lv1 $vg9 lvcreate -l1 -an -n $lv2 $vg9 +mdadm --stop "$mddev" +systemctl stop lvm-activate-$vg9 || true _clear_online_files +mdadm --assemble "$mddev" "$dev1" "$dev2" +# this trigger might be redundant because the mdadm --assemble +# probably triggers an add uevent udevadm trigger --settle -c add /sys/block/$BDEVMD wait_lvm_activate $vg9 @@ -410,3 +415,51 @@ systemctl stop lvm-activate-$vg7 systemctl stop lvm-activate-$vg8 systemctl stop lvm-activate-$vg9 + +# no devices file, filter with symlink of PV +# the pvscan needs to look at all dev names to +# match the symlink in the filter with the +# dev name (or major minor) passed to pvscan. +# This test doesn't really belong in this file +# because it's not testing lvm-activate. + +aux lvmconf 'devices/use_devicesfile = 0' +_clear_online_files +rm "$DF" +vgcreate $vg10 "$dev1" +lvcreate -l1 -an -n $lv1 $vg10 "$dev1" + +PVID1=$(pvs "$dev1" --noheading -o uuid | tr -d - | awk '{print $1}') +# PVID with dashes +OPVID1=`pvs "$dev1" --noheading -o uuid | awk '{print $1}'` + +udevadm trigger --settle -c add /sys/block/$BDEV1 + +# uevent from the trigger should create this symlink +ls /dev/disk/by-id/lvm-pv-uuid-$OPVID1 + +vgchange -an $vg10 +systemctl stop lvm-activate-$vg10 +_clear_online_files + +aux lvmconf "devices/filter = [ \"a|/dev/disk/by-id/lvm-pv-uuid-$OPVID1|\", \"r|.*|\" ]" +aux lvmconf 'devices/global_filter = [ "a|.*|" ]' + +pvscan --cache -aay "$dev1" + +check lv_field $vg10/$lv1 lv_active "active" + +vgchange -an $vg10 +_clear_online_files + +aux lvmconf 'devices/filter = [ "a|lvm-pv-uuid|", "r|.*|" ]' +aux lvmconf 'devices/global_filter = [ "a|.*|" ]' + +pvscan --cache -aay "$dev1" + +check lv_field $vg10/$lv1 lv_active "active" + +vgchange -an $vg10 +vgremove -y $vg10 +wipe_all + diff --git a/tools/pvscan.c b/tools/pvscan.c index d360ec87f..0c25fb542 100644 --- a/tools/pvscan.c +++ b/tools/pvscan.c @@ -816,6 +816,45 @@ out: return ret; } +/* + * The optimization in which only the pvscan arg devname is added to dev-cache + * does not work if there's an lvm.conf filter containing symlinks to the dev + * like /dev/disk/by-id/lvm-pv-uuid-xyz entries. A full dev_cache_scan will + * associate the symlinks with the system dev name passed to pvscan, which lets + * filter-regex match the devname with the symlink name in the filter. + */ +static int _filter_uses_symlinks(struct cmd_context *cmd, int filter_cfg) +{ + const struct dm_config_node *cn; + const struct dm_config_value *cv; + + if ((cn = find_config_tree_array(cmd, filter_cfg, NULL))) { + for (cv = cn->v; cv; cv = cv->next) { + if (cv->type != DM_CFG_STRING) + continue; + if (!cv->v.str) + continue; + + if (!strncmp(cv->v.str, "/dev/disk/", 10)) + return 1; + if (!strncmp(cv->v.str, "/dev/mapper/", 12)) + return 1; + if (cv->v.str[0] == '/') + continue; + + /* In case /dev/disk/by was omitted */ + if (strstr(cv->v.str, "lvm-pv-uuid")) + return 1; + if (strstr(cv->v.str, "dm-uuid")) + return 1; + if (strstr(cv->v.str, "wwn-")) + return 1; + } + } + + return 0; +} + struct pvscan_arg { struct dm_list list; const char *devname; @@ -880,6 +919,30 @@ static int _get_args_devs(struct cmd_context *cmd, struct dm_list *pvscan_args, struct pvscan_arg *arg; struct device_list *devl; + /* + * If no devices file is used, and lvm.conf filter is set to + * accept /dev/disk/by-id/lvm-pv-uuid-xyz or another symlink, + * but pvscan --cache is passed devname or major:minor, so + * pvscan needs to match its arg device to the filter symlink. + * setup_dev_in_dev_cache() adds /dev/sda2 to dev-cache which + * does not match a symlink to /dev/sda2, so we need a full + * dev_cache_scan that will associate all symlinks to sda2, + * which allows filter-regex to work. This case could be + * optimized if needed by adding dev-cache entries for each + * filter "a" entry (filter symlink patterns would still need + * a full dev_cache_scan.) + * (When no devices file is used and 69-dm-lvm.rules is + * used which calls pvscan directly, symlinks may not + * have been created by other rules when pvscan runs, so + * the full dev_cache_scan may still not find them.) + */ + if (!cmd->enable_devices_file && !cmd->enable_devices_list && + (_filter_uses_symlinks(cmd, devices_filter_CFG) || + _filter_uses_symlinks(cmd, devices_global_filter_CFG))) { + log_print_pvscan(cmd, "finding all devices for filter symlinks."); + dev_cache_scan(cmd); + } + /* pass NULL filter when getting devs from dev-cache, filtering is done separately */ /* in common usage, no dev will be found for a devno */

1 0

main - man: lvmautoactivation
by David Teigland 29 Nov '21

29 Nov '21

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=009007484b88fb16e2177… Commit: 009007484b88fb16e2177deaf4774d0e50576a06 Parent: 01bf8e174774359a5c65e7e712d208ff7194310b Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Nov 24 16:03:39 2021 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Nov 29 11:10:02 2021 -0600 man: lvmautoactivation new topical man page describing autoactivation --- man/Makefile.in | 2 +- man/lvm.8_main | 1 + man/lvmautoactivation.7_main | 280 +++++++++++++++++++++++++++++++++++++++++++ man/pvscan.8_des | 63 +++++----- 4 files changed, 309 insertions(+), 37 deletions(-) diff --git a/man/Makefile.in b/man/Makefile.in index 40248d640..ba6f2046f 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -33,7 +33,7 @@ CMIRRORDMAN = cmirrord.8 LVMDBUSDMAN = lvmdbusd.8 MAN5=lvm.conf.5 -MAN7=lvmsystemid.7 lvmreport.7 lvmraid.7 +MAN7=lvmsystemid.7 lvmreport.7 lvmraid.7 lvmautoactivation.7 MAN8=lvm.8 lvmdump.8 lvm-fullreport.8 lvm-lvpoll.8 \ lvcreate.8 lvchange.8 lvmconfig.8 lvconvert.8 lvdisplay.8 \ diff --git a/man/lvm.8_main b/man/lvm.8_main index 6f86d0353..a008a3bc0 100644 --- a/man/lvm.8_main +++ b/man/lvm.8_main @@ -579,6 +579,7 @@ Prepends source file name and code line number with libdm debugging. .BR lvmraid (7), .BR lvmthin (7), .BR lvmcache (7), +.BR lvmautoactivation (7), .P .BR dmsetup (8), .BR dmstats (8), diff --git a/man/lvmautoactivation.7_main b/man/lvmautoactivation.7_main new file mode 100644 index 000000000..87c15a3d1 --- /dev/null +++ b/man/lvmautoactivation.7_main @@ -0,0 +1,280 @@ +.TH "LVMAUTOACTIVATION" "7" "LVM TOOLS #VERSION#" "Red Hat, Inc" "\"" +. +.SH NAME +. +lvmautoactivation \(em LVM autoactivation +. +.SH DESCRIPTION +. +Autoactivation is the activation of LVs performed automatically by the +system in response to LVM devices being attached to the machine. When all +PVs in a VG have been attached, the VG is complete, and LVs in the VG are +activated. +.P +Autoactivation of VGs, or specific LVs, can be prevented using vgchange or +lvchange --setautoactivation n. The lvm.conf auto_activation_volume_list +is another way to limit autoactivation. +.P +The most common form of autoactivation is "event based", in which complete +VGs are activated in response to uevents which occur during system startup +or at any time after the system has started. Another form of +autoactivation is "service based" in which complete VGs are activated at a +fixed point during system startup by a systemd service, and are not +activated in response to uevents. This can be controlled with the +lvm.conf setting event_activation. +.P +Event based autoactivation is driven by udev, udev rules, and systemd. +When a device is attached to a machine, a uevent is generated by the +kernel to notify userspace of the new device. systemd-udev runs udev +rules to process the new device. Udev rules use blkid to identify the +device as an LVM PV and then execute the lvm-specific udev rule for the +device, which triggers autoactivation. +.P +There are two variations of event based autoactivation that may be used a +system, depending on the LVM udev rule that is installed (found in +/lib/udev/rules.d/.) The following summarizes the steps in each rule +which lead to autoactivation: +.P +.B 69-dm-lvm-metad.rules +. +.IP \[bu] 2 +device /dev/name with major:minor X:Y is attached to the machine +. +.IP \[bu] 2 +systemd/udev runs blkid to identify /dev/name as an LVM PV +. +.IP \[bu] 2 +udev rule 69-dm-lvm-metad.rules is run for /dev/name +. +.IP \[bu] 2 +the lvm udev rule runs the systemd service lvm2-pvscan@X:Yservice +. +.IP \[bu] 2 +the lvm2-pvscan service runs: +.br +pvscan --cache -aay --major X --minor Y +. +.IP \[bu] 2 +pvscan reads the device, records that the PV is online +(see pvs_online), and checks if the VG is complete. +. +.IP \[bu] 2 +if the VG is complete, pvscan creates the vgs_online temp file, +and activates the VG. +. +.IP \[bu] 2 +the activation command output can be seen from +systemctl status lvm2-pvscan* +.P +.B 69-dm-lvm.rules +. +.IP \[bu] 2 +device /dev/name with major:minor X:Y is attached to the machine +. +.IP \[bu] 2 +systemd/udev runs blkid to identify /dev/name as an LVM PV +. +.IP \[bu] 2 +udev rule 69-dm-lvm.rules is run for /dev/name +. +.IP \[bu] 2 +the lvm udev rule runs: +.br +pvscan --cache --listvg --checkcomplete --vgonline +.br +--autoactivation event --udevoutput --journal=output /dev/name +. +.IP \[bu] 2 +pvscan reads the device, records that the PV is online +(see pvs_online), and checks if the VG is complete. +. +.IP \[bu] 2 +if the VG is complete, pvscan creates the vgs_online temp file, +and prints the name of the VG for the udev rule to import: +LVM_VG_NAME_COMPLETE='vgname' +. +.IP \[bu] 2 +if the lvm udev rule sees LVM_VG_NAME_COMPLETE from pvscan, +it activates the VG using a transient systemd service named +lvm-activate-<vgname>. +. +.IP \[bu] 2 +the lvm-activate-<vgname> service runs +.br +vgchange -aay --autoactivation event <vgname> +. +.IP \[bu] 2 +the activation command output can be seen from +systemctl status lvm-activate-<vgname> +.P +. +.SS pvscan options +.P +.B --cache +.br +Read the <device> arg (and only that device), and record that +the PV is online by creating the /run/lvm/pvs_online/<pvid> +file containing the name of the VG and the device for the PV. +.P +.B -aay +.br +Activate the VG from the pvscan command +(includes implicit --checkcomplete and --vgonline.) +.P +.B --checkcomplete +.br +Check if the VG is complete, i.e. all PVs are present on +the system, by checking /run/lvm/pvs_online/<pvid> files. +.P +.B --vgonline +.br +Create /run/lvm/vgs_online/<vgname> if the VG is complete +(used to ensure only one command performs activation.) +.P +.B --autoactivation event +.br +Inform the command it is used for event based autoactivation. +.P +.B --listvg +.br +Print the name of the VG using the device. +.P +.B --udevoutput +.br +Only print output that can be imported to the udev rule, +using the udev environment key format, i.e. NAME='value'. +.P +.B --journal=output +.br +Send standard command output to the journal (when stdout +is reserved for udev output.) +.P +.SS Temp files +.P +Autoactivation commands use a number of temp files in /run/lvm (with the +expectation that /run is cleared between boots.) +.P +.B pvs_online +.br +pvscan --cache creates a file here for each PV that is attached. The file +is named with the PVID and contains the VG name and device information. +The existence of the file is used to determine when all PVs for a given VG +are present. The device information in these files is also used to +optimize locating devices for a VG when the VG is activated. +.P +.B pvs_lookup +.br +pvscan --cache creates a file here named for a VG (if one doesn't already +exist.) The file contains a list of PVIDs in the VG. This is needed when +a PV is processed which has no VG metadata, in which case the list of +PVIDs from the lookup file is used to check if the VG is complete. +.P +.B vgs_online +.br +The first activation command (pvscan or vgchange) to create a file here, +named for the VG, will activate the VG. This resolves a race when +concurrent commands attempt to activate a VG at once. +. +.SH EXAMPLES +.P +VG "vg" contains two PVs: +.nf +$ pvs -o name,vgname,uuid /dev/sdb /dev/sdc + PV VG PV UUID + /dev/sdb vg 1uKpaT-lFOZ-NLHX-j4jI-OBi1-QpdE-HZ5hZY + /dev/sdc vg 5J3tM8-aIPe-2vbd-DBe7-bvRq-TGj0-DaKV2G +.fi +.P +use of --cache: +.nf +$ pvscan --cache /dev/sdb + pvscan[12922] PV /dev/sdb online. +$ pvscan --cache /dev/sdc + pvscan[12923] PV /dev/sdc online. + +$ cat /run/lvm/pvs_online/1uKpaTlFOZNLHXj4jIOBi1QpdEHZ5hZY +8:16 +vg:vg +dev:/dev/sdb +$ cat /run/lvm/pvs_online/5J3tM8aIPe2vbdDBe7bvRqTGj0DaKV2G +8:32 +vg:vg +dev:/dev/sdc +.fi +.P +use of -aay: +.nf +$ pvscan --cache -aay /dev/sdb + pvscan[12935] PV /dev/sdb online, VG vg incomplete (need 1). +$ pvscan --cache -aay /dev/sdc + pvscan[12936] PV /dev/sdc online, VG vg is complete. + pvscan[12936] VG vg run autoactivation. + 1 logical volume(s) in volume group "vg" now active + +$ cat /run/lvm/pvs_online/1uKpaTlFOZNLHXj4jIOBi1QpdEHZ5hZY +8:16 +vg:vg +dev:/dev/sdb +$ cat /run/lvm/pvs_online/5J3tM8aIPe2vbdDBe7bvRqTGj0DaKV2G +8:32 +vg:vg +dev:/dev/sdc +$ ls /run/lvm/vgs_online/vg +/run/lvm/vgs_online/vg +.fi +.P +use of --listvg: +.nf +$ pvscan --cache --listvg /dev/sdb + VG vg +$ pvscan --cache --listvg /dev/sdc + VG vg + +$ cat /run/lvm/pvs_online/1uKpaTlFOZNLHXj4jIOBi1QpdEHZ5hZY +8:16 +vg:vg +dev:/dev/sdb +$ cat /run/lvm/pvs_online/5J3tM8aIPe2vbdDBe7bvRqTGj0DaKV2G +8:32 +vg:vg +dev:/dev/sdc +.fi +.P +use of --checkcomplete: +.nf +$ pvscan --cache --listvg --checkcomplete --vgonline /dev/sdb + pvscan[12996] PV /dev/sdb online, VG vg incomplete (need 1). + VG vg incomplete +$ pvscan --cache --listvg --checkcomplete --vgonline /dev/sdc + pvscan[12997] PV /dev/sdc online, VG vg is complete. + VG vg complete +.fi +.P +use of --udevoutput: +.nf +$ pvscan --cache --listvg --checkcomplete --vgonline --udevoutput /dev/sdb +LVM_VG_NAME_INCOMPLETE='vg' +$ pvscan --cache --listvg --checkcomplete --vgonline --udevoutput /dev/sdc +LVM_VG_NAME_COMPLETE='vg' +.fi +.P +use of --listlvs: +.nf +$ lvs -o name,devices vg + LV Devices + lvol0 /dev/sdb(0) + lvol1 /dev/sdc(0) + lvol2 /dev/sdb(1),/dev/sdc(1) + +$ pvscan --cache --listlvs --checkcomplete /dev/sdb + pvscan[13288] PV /dev/sdb online, VG vg incomplete (need 1). + VG vg incomplete + LV vg/lvol0 complete + LV vg/lvol2 incomplete +$ pvscan --cache --listlvs --checkcomplete /dev/sdc + pvscan[13289] PV /dev/sdc online, VG vg is complete. + VG vg complete + LV vg/lvol1 complete + LV vg/lvol2 complete +.fi + diff --git a/man/pvscan.8_des b/man/pvscan.8_des index b20b987da..4c5929955 100644 --- a/man/pvscan.8_des +++ b/man/pvscan.8_des @@ -4,56 +4,47 @@ like or .BR pvdisplay (8). .P -When the --cache and -aay options are used, pvscan records which PVs are -available on the system, and activates LVs in completed VGs. A VG is -complete when pvscan sees that the final PV in the VG has appeared. This -is used by event-based system startup (systemd, udev) to activate LVs. -.P -The four main variations of this are: +When --cache is used, pvscan updates runtime lvm state on the system, or +with -aay performs autoactivation. .P .B pvscan --cache .I device .P -If device is present, lvm adds a record that the PV on device is online. +If device is present, lvm records that the PV on device is online. If device is not present, lvm removes the online record for the PV. -In most cases, the pvscan will only read the named devices. +pvscan only reads the named device. .P -.B pvscan --cache -aay -.IR device ... +.B pvscan --cache .P -This begins by performing the same steps as above. Afterward, if the VG -for the specified PV is complete, then pvscan will activate LVs in the VG -(the same as vgchange -aay vgname would do.) +Updates the runtime state for all lvm devices. .P -.B pvscan --cache +.B pvscan --cache -aay +.I device .P -This first clears all existing PV online records, then scans all devices -on the system, adding PV online records for any PVs that are found. +Performs the --cache steps for the device, then checks if the VG using the +device is complete. If so, LVs in the VG are autoactivated, the same as +vgchange -aay vgname would do. (A device name may be replaced with major +and minor numbers.) .P .B pvscan --cache -aay .P -This begins by performing the same steps as pvscan --cache. Afterward, it -activates LVs in any complete VGs. +Performs the --cache steps for all devices, then autoactivates any complete VGs. .P -To prevent devices from being scanned by pvscan --cache, add them -to -.BR lvm.conf (5) -.B devices/global_filter. -For more information, see: -.br -.B lvmconfig --withcomments devices/global_filter +.B pvscan --cache --listvg|--listlvs +.I device +.P +Performs the --cache steps for the device, then prints the name of the VG +using the device, or the names of LVs using the device. --checkcomplete +is usually included to check if all PVs for the VG or LVs are online. +When this command is called by a udev rule, the output must conform to +udev rule specifications (see --udevoutput.) The udev rule will use the +results to perform autoactivation. .P -Auto-activation of VGs or LVs can be enabled/disabled using: -.br +Autoactivation of VGs or LVs can be enabled/disabled using vgchange or +lvchange with --setautoactivation y|n, or by adding names to .BR lvm.conf (5) .B activation/auto_activation_volume_list .P -For more information, see: -.br -.B lvmconfig --withcomments activation/auto_activation_volume_list -.P -To disable auto-activation, explicitly set this list to an empty list, -i.e. auto_activation_volume_list = [ ]. -.P -When this setting is undefined (e.g. commented), then all LVs are -auto-activated. +See +.BR lvmautoactivation (7) +for more information about how pvscan is used for autoactivation.

1 0

main - devices: exclude md components when duplicate pvs are seen
by David Teigland 22 Nov '21

22 Nov '21

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=01bf8e174774359a5c65e… Commit: 01bf8e174774359a5c65e7e712d208ff7194310b Parent: 114e1cfee532eac7d594549f68f21e9f6ee67dc5 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Nov 22 15:10:43 2021 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Mon Nov 22 15:10:43 2021 -0600 devices: exclude md components when duplicate pvs are seen Improve handling of md components that get through the filter, like the previous improvement for multipath. If md components get through the filter and trigger duplicate PV code, then eliminate any devs entirely that are not an md device. --- lib/cache/lvmcache.c | 168 +++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 149 insertions(+), 19 deletions(-) diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index b3a4b5a71..c5359f3c5 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -683,7 +683,7 @@ static int _all_multipath_components(struct cmd_context *cmd, struct lvmcache_in wwid = device_id_system_read(cmd, dev, DEV_ID_TYPE_SYS_WWID); if (!wwid && wwid1) { - log_print("Different wwids for duplicate PVs %s %s %s none", + log_debug("Different wwids for duplicate PVs %s %s %s none", dev_name(dev1), wwid1, dev_name(dev)); diff_wwid++; continue; @@ -700,7 +700,7 @@ static int _all_multipath_components(struct cmd_context *cmd, struct lvmcache_in /* Different wwids indicates these are not multipath components. */ if (strcmp(wwid1, wwid)) { - log_print("Different wwids for duplicate PVs %s %s %s %s", + log_debug("Different wwids for duplicate PVs %s %s %s %s", dev_name(dev1), wwid1, dev_name(dev), wwid); diff_wwid++; continue; @@ -731,6 +731,52 @@ static int _all_multipath_components(struct cmd_context *cmd, struct lvmcache_in return 1; } +static int _all_md_components(struct cmd_context *cmd, struct lvmcache_info *info, const char *pvid, + struct dm_list *altdevs, struct device **dev_md_out) +{ + struct device_list *devl; + struct device *dev_md = NULL; + struct device *dev; + int real_dup = 0; + + *dev_md_out = NULL; + + /* There will often be no info struct because of the extra_md_checks function. */ + + if (info && (cmd->dev_types->md_major == MAJOR(info->dev->dev))) + dev_md = info->dev; + + dm_list_iterate_items(devl, altdevs) { + dev = devl->dev; + + if (cmd->dev_types->md_major == MAJOR(dev->dev)) { + if (dev_md) { + /* md devs themselves are dups */ + log_debug("Found multiple md devices for PVID %s: %s %s", + pvid, dev_name(dev_md), dev_name(dev)); + real_dup = 1; + break; + } else + dev_md = dev; + } else { + if (!dev_is_md_component(cmd, dev, NULL, 1)) { + /* md dev copied to another device */ + real_dup = 1; + break; + } + } + } + + if (real_dup) + return 0; + + if (dev_md) + log_debug("Found md device %s for PVID %s.", dev_name(dev_md), pvid); + + *dev_md_out = dev_md; + return 1; +} + /* * If we've found devices with the same PVID, decide which one * to use. @@ -786,7 +832,7 @@ static void _choose_duplicates(struct cmd_context *cmd, struct device_list *devl, *devl_safe, *devl_add, *devl_del; struct lvmcache_info *info; struct device *dev1, *dev2; - struct device *dev_mpath; + struct device *dev_mpath, *dev_md; struct device *dev_drop; const char *device_id = NULL, *device_id_type = NULL; const char *idname1 = NULL, *idname2 = NULL; @@ -811,6 +857,7 @@ next: dm_list_init(&altdevs); pvid = NULL; dev_mpath = NULL; + dev_md = NULL; dm_list_iterate_items_safe(devl, devl_safe, &_initial_duplicates) { if (!pvid) { @@ -839,6 +886,11 @@ next: * the md/mpath device gives us a last chance to drop the component. * An md/mpath component device is completely ignored, as if it had * been filtered, and not kept in the list unused duplicates. + * + * One issue related to eliminating mpath/md duplicate PVs here is + * that it occurs after label_scan, and hints are created based + * on what label_scan finds, so hints are disabled due to duplicate + * PVs that are later resolved here. */ /* @@ -908,24 +960,89 @@ next: /* * Get rid of any md components. - * FIXME: use a function like _all_multipath_components to pick the actual md device. */ - if (info && dev_is_md_component(cmd, info->dev, NULL, 1)) { - /* does not go in del_cache_devs which become unused_duplicates */ - log_debug("Ignoring md component %s with PVID %s (dropping info)", dev_name(info->dev), pvid); - lvmcache_del(info); - info = NULL; - } + if (_all_md_components(cmd, info, pvid, &altdevs, &dev_md)) { + if (info && dev_md && (info->dev != dev_md)) { + /* + * info should be dropped from lvmcache and info->dev + * should be treated as if it had been excluded by a filter. + * dev_md should be added to lvmcache by the caller. + * Often this info struct has been removed by + * lvmcache_extra_md_component_checks. + */ + dev_drop = info->dev; - dm_list_iterate_items_safe(devl, devl_safe, &altdevs) { - if (dev_is_md_component(cmd, devl->dev, NULL, 1)) { - log_debug("Ignoring md component %s with PVID %s (dropping duplicate)", dev_name(devl->dev), pvid); - dm_list_del(&devl->list); + /* Have caller add dev_md to lvmcache. */ + log_debug("Using md device %s for PVID %s.", dev_name(dev_md), pvid); + if ((devl_add = zalloc(sizeof(*devl_add)))) { + devl_add->dev = dev_md; + dm_list_add(add_cache_devs, &devl_add->list); + } + + /* Remove dev_md from altdevs. */ + if ((devl = _get_devl_in_device_list(dev_md, &altdevs))) + dm_list_del(&devl->list); + + /* Remove info from lvmcache that came from the component dev. */ + log_debug("Ignoring md component %s with PVID %s (dropping info)", dev_name(dev_drop), pvid); + lvmcache_del(info); + info = NULL; + + /* Make the component dev look like it was filtered. */ + cmd->filter->wipe(cmd, cmd->filter, dev_drop, NULL); + dev_drop->flags &= ~DEV_SCAN_FOUND_LABEL; } - } - if (dm_list_empty(&altdevs)) + if (!info && dev_md) { + /* + * The info struct was from a component and was dropped + * and the actual md dev was found on initial_duplicates + * and the caller should add it to lvmcache. + */ + + /* Have caller add dev_md to lvmcache. */ + log_debug("Using md device %s for PVID %s.", dev_name(dev_md), pvid); + if ((devl_add = zalloc(sizeof(*devl_add)))) { + devl_add->dev = dev_md; + dm_list_add(add_cache_devs, &devl_add->list); + } + + /* Remove dev_md from altdevs. */ + if ((devl = _get_devl_in_device_list(dev_md, &altdevs))) + dm_list_del(&devl->list); + } + + if (info && !dev_md) { + /* + * Only md component devs were found and no actual + * md dev, so drop the component from lvmcache. + */ + dev_drop = info->dev; + + log_debug("Ignoring md component %s with PVID %s (dropping info)", dev_name(dev_drop), pvid); + lvmcache_del(info); + info = NULL; + + /* Make the component dev look like it was filtered. */ + cmd->filter->wipe(cmd, cmd->filter, dev_drop, NULL); + dev_drop->flags &= ~DEV_SCAN_FOUND_LABEL; + } + + dm_list_iterate_items_safe(devl, devl_safe, &altdevs) { + /* + * The altdevs are all md components that should look + * like they were filtered, they are not in lvmcache. + */ + dev_drop = devl->dev; + + log_debug("Ignoring md component %s with PVID %s (dropping duplicate)", dev_name(dev_drop), pvid); + dm_list_del(&devl->list); + + cmd->filter->wipe(cmd, cmd->filter, dev_drop, NULL); + dev_drop->flags &= ~DEV_SCAN_FOUND_LABEL; + } goto next; + } /* * Find the device for the pvid that's currently in lvmcache. @@ -1331,6 +1448,18 @@ int lvmcache_label_reopen_vg_rw(struct cmd_context *cmd, const char *vgname, con * times it can be a clue that label_scan mistakenly read the pv from an md * component device instead of from the md device itself. So for unmatching * sizes, we do a full md component check on the device. + * + * It might be nice to do this checking in the filter (when passes_filter is + * called after the initial read), but that doesn't work because passes_filter + * is called before _text_read so metadata/pvsummary info is not yet available + * which this function uses. + * + * The unique value of this function is that it can eliminate md components + * without there being duplicate PVs. But, there will often be duplicate PVs, + * handled by _all_md_components(), where other devs with the same pvid will be + * in _initial_duplicates. One could be the md device itself which will be + * added to lvmcache by choose_duplicates, and other duplicates that are + * components will be dropped. */ void lvmcache_extra_md_component_checks(struct cmd_context *cmd) @@ -1392,7 +1521,8 @@ void lvmcache_extra_md_component_checks(struct cmd_context *cmd) */ if (pvsize && devsize && (pvsize != devsize)) do_check_size = 1; - if (device_hint && !strncmp(device_hint, "/dev/md", 7)) + if (device_hint && !strncmp(device_hint, "/dev/md", 7) && + (MAJOR(info->dev->dev) != cmd->dev_types->md_major)) do_check_name = 1; if (!do_check_size && !do_check_name) @@ -1422,11 +1552,11 @@ void lvmcache_extra_md_component_checks(struct cmd_context *cmd) device_hint ?: "none", dev_name(dev)); if (dev_is_md_component(cmd, dev, NULL, 1)) { - log_debug("dropping PV from md component %s", dev_name(dev)); + log_debug("Ignoring PV from md component %s with PVID %s (metadata %s %llu)", + dev_name(dev), dev->pvid, device_hint ?: "none", (unsigned long long)pvsize); dev->flags &= ~DEV_SCAN_FOUND_LABEL; /* lvmcache_del will also delete vginfo if info was last one */ lvmcache_del(info); - lvmcache_del_dev_from_duplicates(dev); cmd->filter->wipe(cmd, cmd->filter, dev, NULL); } }

1 0

main - fix spelling of pruning
by David Teigland 19 Nov '21

19 Nov '21

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=114e1cfee532eac7d5945… Commit: 114e1cfee532eac7d594549f68f21e9f6ee67dc5 Parent: 212b1fc529a7d550c49f32cb7cbecb017ceb35b0 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Nov 19 12:02:35 2021 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Nov 19 12:02:35 2021 -0600 fix spelling of pruning --- lib/format_text/archive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/format_text/archive.c b/lib/format_text/archive.c index 09a472b4c..2e8792a93 100644 --- a/lib/format_text/archive.c +++ b/lib/format_text/archive.c @@ -219,7 +219,7 @@ static void _remove_expired(const char *dir, const char *vgname, sum /= 1024 * 1024; if (sum > 128 || archives_size > 8192) - log_print_unless_silent("Consider prunning %s VG archive with more then %u MiB in %u files (check archiving is needed in lvm.conf).", + log_print_unless_silent("Consider pruning %s VG archive with more then %u MiB in %u files (check archiving is needed in lvm.conf).", vgname, (unsigned)sum, archives_size); }

1 0

main - devices: exclude multipath components based on matching wwid
by David Teigland 18 Nov '21

18 Nov '21

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=212b1fc529a7d550c49f3… Commit: 212b1fc529a7d550c49f32cb7cbecb017ceb35b0 Parent: b8f4ec846d8f4f5256b2737a6d6127482ef7b44e Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Nov 17 17:10:45 2021 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Nov 18 17:41:00 2021 -0600 devices: exclude multipath components based on matching wwid If multipath component devices get through the filter and cause lvm to see duplicate PVs, then check the wwid of the devs and drop the component devices as if they had been filtered. If a dm mpath device was found among the duplicates then use that as the PV, otherwise do not use any of the components as the PV. "duplicate PVs" associated with multipath configs will no longer stop commands from working. --- lib/cache/lvmcache.c | 186 ++++++++++++++++++++++++++++++++-- lib/device/dev-mpath.c | 71 +++++++++++++ lib/device/dev-type.h | 2 + lib/device/device_id.c | 13 ++- lib/device/device_id.h | 2 + test/shell/duplicate-pvs-multipath.sh | 67 ++++++++++++ 6 files changed, 330 insertions(+), 11 deletions(-) diff --git a/lib/cache/lvmcache.c b/lib/cache/lvmcache.c index 81b9b0ec9..b3a4b5a71 100644 --- a/lib/cache/lvmcache.c +++ b/lib/cache/lvmcache.c @@ -635,6 +635,102 @@ static void _warn_unused_duplicates(struct cmd_context *cmd) } } +static int _all_multipath_components(struct cmd_context *cmd, struct lvmcache_info *info, const char *pvid, + struct dm_list *altdevs, struct device **dev_mpath) +{ + struct device_list *devl; + struct device *dev_mp = NULL; + struct device *dev1 = NULL; + struct device *dev; + const char *wwid1 = NULL; + const char *wwid; + int diff_wwid = 0; + int same_wwid = 0; + int dev_is_mp; + + *dev_mpath = NULL; + + /* This function only makes sense with more than one dev. */ + if ((info && dm_list_empty(altdevs)) || (!info && (dm_list_size(altdevs) == 1))) { + log_debug("Skip multipath component checks with single device for PVID %s", pvid); + return 0; + } + + log_debug("Checking for multipath components for duplicate PVID %s", pvid); + + if (info) { + dev = info->dev; + dev_is_mp = (cmd->dev_types->device_mapper_major == MAJOR(dev->dev)) && dev_has_mpath_uuid(cmd, dev, NULL); + + if (dev_is_mp) { + if ((wwid1 = dev_mpath_component_wwid(cmd, dev))) { + dev_mp = dev; + dev1 = dev; + } + } else { + if ((wwid1 = device_id_system_read(cmd, dev, DEV_ID_TYPE_SYS_WWID))) + dev1 = dev; + } + } + + dm_list_iterate_items(devl, altdevs) { + dev = devl->dev; + dev_is_mp = (cmd->dev_types->device_mapper_major == MAJOR(dev->dev)) && dev_has_mpath_uuid(cmd, dev, NULL); + + if (dev_is_mp) + wwid = dev_mpath_component_wwid(cmd, dev); + else + wwid = device_id_system_read(cmd, dev, DEV_ID_TYPE_SYS_WWID); + + if (!wwid && wwid1) { + log_print("Different wwids for duplicate PVs %s %s %s none", + dev_name(dev1), wwid1, dev_name(dev)); + diff_wwid++; + continue; + } + + if (!wwid) + continue; + + if (!wwid1) { + wwid1 = wwid; + dev1 = dev; + continue; + } + + /* Different wwids indicates these are not multipath components. */ + if (strcmp(wwid1, wwid)) { + log_print("Different wwids for duplicate PVs %s %s %s %s", + dev_name(dev1), wwid1, dev_name(dev), wwid); + diff_wwid++; + continue; + } + + /* Different mpath devs with the same wwid shouldn't happen. */ + if (dev_is_mp && dev_mp) { + log_print("Found multiple multipath devices for PVID %s WWID %s: %s %s", + pvid, wwid1, dev_name(dev_mp), dev_name(dev)); + continue; + } + + log_debug("Same wwids for duplicate PVs %s %s", dev_name(dev1), dev_name(dev)); + same_wwid++; + + /* Save the mpath device so it can be used as the PV. */ + if (dev_is_mp) + dev_mp = dev; + } + + if (diff_wwid || !same_wwid) + return 0; + + if (dev_mp) + log_debug("Found multipath device %s for PVID %s WWID %s.", dev_name(dev_mp), pvid, wwid1); + + *dev_mpath = dev_mp; + return 1; +} + /* * If we've found devices with the same PVID, decide which one * to use. @@ -690,6 +786,8 @@ static void _choose_duplicates(struct cmd_context *cmd, struct device_list *devl, *devl_safe, *devl_add, *devl_del; struct lvmcache_info *info; struct device *dev1, *dev2; + struct device *dev_mpath; + struct device *dev_drop; const char *device_id = NULL, *device_id_type = NULL; const char *idname1 = NULL, *idname2 = NULL; uint32_t dev1_major, dev1_minor, dev2_major, dev2_minor; @@ -712,6 +810,7 @@ static void _choose_duplicates(struct cmd_context *cmd, next: dm_list_init(&altdevs); pvid = NULL; + dev_mpath = NULL; dm_list_iterate_items_safe(devl, devl_safe, &_initial_duplicates) { if (!pvid) { @@ -730,23 +829,97 @@ next: return; } + info = lvmcache_info_from_pvid(pvid, NULL, 0); + /* - * Get rid of any md components before comparing alternatives. - * (Since an md component can never be used, it's not an - * option to use like other kinds of alternatives.) + * Usually and ideally, components of md and multipath devs should have + * been excluded by filters, and not scanned for a PV. In some unusual + * cases the components can get through the filters, and a PV can be + * found on them. Detecting the same PVID on both the component and + * the md/mpath device gives us a last chance to drop the component. + * An md/mpath component device is completely ignored, as if it had + * been filtered, and not kept in the list unused duplicates. */ - info = lvmcache_info_from_pvid(pvid, NULL, 0); + /* + * Get rid of multipath components based on matching wwids. + */ + if (_all_multipath_components(cmd, info, pvid, &altdevs, &dev_mpath)) { + if (info && dev_mpath && (info->dev != dev_mpath)) { + /* + * info should be dropped from lvmcache and info->dev + * should be treated as if it had been excluded by a filter. + * dev_mpath should be added to lvmcache by the caller. + */ + dev_drop = info->dev; + + /* Have caller add dev_mpath to lvmcache. */ + log_debug("Using multipath device %s for PVID %s.", dev_name(dev_mpath), pvid); + if ((devl_add = zalloc(sizeof(*devl_add)))) { + devl_add->dev = dev_mpath; + dm_list_add(add_cache_devs, &devl_add->list); + } + + /* Remove dev_mpath from altdevs. */ + if ((devl = _get_devl_in_device_list(dev_mpath, &altdevs))) + dm_list_del(&devl->list); + + /* Remove info from lvmcache that came from the component dev. */ + log_debug("Ignoring multipath component %s with PVID %s (dropping info)", dev_name(dev_drop), pvid); + lvmcache_del(info); + info = NULL; + + /* Make the component dev look like it was filtered. */ + cmd->filter->wipe(cmd, cmd->filter, dev_drop, NULL); + dev_drop->flags &= ~DEV_SCAN_FOUND_LABEL; + } + + if (info && !dev_mpath) { + /* + * Only mpath component devs were found and no actual + * multipath dev, so drop the component from lvmcache. + */ + dev_drop = info->dev; + + log_debug("Ignoring multipath component %s with PVID %s (dropping info)", dev_name(dev_drop), pvid); + lvmcache_del(info); + info = NULL; + + /* Make the component dev look like it was filtered. */ + cmd->filter->wipe(cmd, cmd->filter, dev_drop, NULL); + dev_drop->flags &= ~DEV_SCAN_FOUND_LABEL; + } + + dm_list_iterate_items_safe(devl, devl_safe, &altdevs) { + /* + * The altdevs are all mpath components that should look + * like they were filtered, they are not in lvmcache. + */ + dev_drop = devl->dev; + + log_debug("Ignoring multipath component %s with PVID %s (dropping duplicate)", dev_name(dev_drop), pvid); + dm_list_del(&devl->list); + + cmd->filter->wipe(cmd, cmd->filter, dev_drop, NULL); + dev_drop->flags &= ~DEV_SCAN_FOUND_LABEL; + } + goto next; + } + + /* + * Get rid of any md components. + * FIXME: use a function like _all_multipath_components to pick the actual md device. + */ if (info && dev_is_md_component(cmd, info->dev, NULL, 1)) { /* does not go in del_cache_devs which become unused_duplicates */ - log_debug_cache("PV %s drop MD component from scan selection %s", pvid, dev_name(info->dev)); + log_debug("Ignoring md component %s with PVID %s (dropping info)", dev_name(info->dev), pvid); lvmcache_del(info); info = NULL; } dm_list_iterate_items_safe(devl, devl_safe, &altdevs) { if (dev_is_md_component(cmd, devl->dev, NULL, 1)) { - log_debug_cache("PV %s drop MD component from scan duplicates %s", pvid, dev_name(devl->dev)); + log_debug("Ignoring md component %s with PVID %s (dropping duplicate)", dev_name(devl->dev), pvid); dm_list_del(&devl->list); } } @@ -754,7 +927,6 @@ next: if (dm_list_empty(&altdevs)) goto next; - /* * Find the device for the pvid that's currently in lvmcache. */ diff --git a/lib/device/dev-mpath.c b/lib/device/dev-mpath.c index ba7bf9740..cbbad9dc9 100644 --- a/lib/device/dev-mpath.c +++ b/lib/device/dev-mpath.c @@ -482,3 +482,74 @@ found: return 1; } +const char *dev_mpath_component_wwid(struct cmd_context *cmd, struct device *dev) +{ + char slaves_path[PATH_MAX]; + char wwid_path[PATH_MAX]; + char sysbuf[PATH_MAX] = { 0 }; + char *slave_name; + const char *wwid = NULL; + struct stat info; + DIR *dr; + struct dirent *de; + + /* /sys/dev/block/253:7/slaves/sda/device/wwid */ + + if (dm_snprintf(slaves_path, sizeof(slaves_path), "%s/dev/block/%d:%d/slaves", + dm_sysfs_dir(), (int)MAJOR(dev->dev), (int)MINOR(dev->dev)) < 0) { + log_warn("Sysfs path to check mpath components is too long."); + return NULL; + } + + if (stat(slaves_path, &info)) + return NULL; + + if (!S_ISDIR(info.st_mode)) { + log_warn("Path %s is not a directory.", slaves_path); + return NULL; + } + + /* Get wwid from first component */ + + if (!(dr = opendir(slaves_path))) { + log_debug("Device %s has no slaves dir", dev_name(dev)); + return NULL; + } + + while ((de = readdir(dr))) { + if (!strcmp(de->d_name, ".") || !strcmp(de->d_name, "..")) + continue; + + /* slave_name "sda" */ + slave_name = de->d_name; + + /* read /sys/block/sda/device/wwid */ + + if (dm_snprintf(wwid_path, sizeof(wwid_path), "%s/block/%s/device/wwid", + dm_sysfs_dir(), slave_name) < 0) { + log_warn("Failed to create sysfs wwid path for %s", slave_name); + continue; + } + + get_sysfs_value(wwid_path, sysbuf, sizeof(sysbuf), 0); + if (!sysbuf[0]) + continue; + + if (strstr(sysbuf, "scsi_debug")) { + int i; + for (i = 0; i < strlen(sysbuf); i++) { + if (sysbuf[i] == ' ') + sysbuf[i] = '_'; + } + } + + if ((wwid = dm_pool_strdup(cmd->mem, sysbuf))) + break; + } + if (closedir(dr)) + stack; + + return wwid; +} + + diff --git a/lib/device/dev-type.h b/lib/device/dev-type.h index f3521c6e0..36fb8f258 100644 --- a/lib/device/dev-type.h +++ b/lib/device/dev-type.h @@ -63,6 +63,8 @@ int dev_is_swap(struct cmd_context *cmd, struct device *dev, uint64_t *signature int dev_is_luks(struct cmd_context *cmd, struct device *dev, uint64_t *signature, int full); int dasd_is_cdl_formatted(struct device *dev); +const char *dev_mpath_component_wwid(struct cmd_context *cmd, struct device *dev); + int dev_is_lvm1(struct device *dev, char *buf, int buflen); int dev_is_pool(struct device *dev, char *buf, int buflen); diff --git a/lib/device/device_id.c b/lib/device/device_id.c index b6e31d0e7..06d64a494 100644 --- a/lib/device/device_id.c +++ b/lib/device/device_id.c @@ -243,7 +243,7 @@ static int _dm_uuid_has_prefix(char *sysbuf, const char *prefix) } /* the dm uuid uses the wwid of the underlying dev */ -static int _dev_has_mpath_uuid(struct cmd_context *cmd, struct device *dev, const char **idname_out) +int dev_has_mpath_uuid(struct cmd_context *cmd, struct device *dev, const char **idname_out) { char sysbuf[PATH_MAX] = { 0 }; const char *idname; @@ -312,8 +312,13 @@ const char *device_id_system_read(struct cmd_context *cmd, struct device *dev, u read_sys_block(cmd, dev, "wwid", sysbuf, sizeof(sysbuf)); /* scsi_debug wwid begins "t10.Linux scsi_debug ..." */ - if (strstr(sysbuf, "scsi_debug")) - sysbuf[0] = '\0'; + if (strstr(sysbuf, "scsi_debug")) { + int i; + for (i = 0; i < strlen(sysbuf); i++) { + if (sysbuf[i] == ' ') + sysbuf[i] = '_'; + } + } /* qemu wwid begins "t10.ATA QEMU HARDDISK ..." */ if (strstr(sysbuf, "QEMU HARDDISK")) @@ -982,7 +987,7 @@ int device_id_add(struct cmd_context *cmd, struct device *dev, const char *pvid_ } if (MAJOR(dev->dev) == cmd->dev_types->device_mapper_major) { - if (_dev_has_mpath_uuid(cmd, dev, &idname)) { + if (dev_has_mpath_uuid(cmd, dev, &idname)) { idtype = DEV_ID_TYPE_MPATH_UUID; goto id_done; } diff --git a/lib/device/device_id.h b/lib/device/device_id.h index 0ada35c94..a53db12e0 100644 --- a/lib/device/device_id.h +++ b/lib/device/device_id.h @@ -56,4 +56,6 @@ void unlink_searched_devnames(struct cmd_context *cmd); int read_sys_block(struct cmd_context *cmd, struct device *dev, const char *suffix, char *sysbuf, int sysbufsize); +int dev_has_mpath_uuid(struct cmd_context *cmd, struct device *dev, const char **idname_out); + #endif diff --git a/test/shell/duplicate-pvs-multipath.sh b/test/shell/duplicate-pvs-multipath.sh new file mode 100644 index 000000000..a145e4afb --- /dev/null +++ b/test/shell/duplicate-pvs-multipath.sh @@ -0,0 +1,67 @@ +#!/usr/bin/env bash + +# Copyright (C) 2021 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 + +test_description='udev rule and systemd unit run vgchange' + +SKIP_WITH_LVMPOLLD=1 +SKIP_WITH_LVMLOCKD=1 + +. lib/inittest + +# FIXME: skip until mpath/scsi_debug cleanup works after a failure +skip + +modprobe --dry-run scsi_debug || skip +multipath -l || skip +multipath -l | grep scsi_debug && skip + +# Turn off multipath_component_detection so that the duplicate +# resolution of mpath components is used. +aux lvmconf 'devices/multipath_component_detection = 0' +# Prevent wwids from being used for filtering. +aux lvmconf 'devices/multipath_wwids_file = "/dev/null"' +# Need to use /dev/mapper/mpath +aux lvmconf 'devices/dir = "/dev"' +aux lvmconf 'devices/scan = "/dev"' +# Could set filter to $MP and the component /dev/sd devs +aux lvmconf "devices/filter = [ \"a|.*|\" ]" +aux lvmconf "devices/global_filter = [ \"a|.*|\" ]" + +modprobe scsi_debug dev_size_mb=100 num_tgts=1 vpd_use_hostno=0 add_host=4 delay=20 max_luns=2 no_lun_0=1 +sleep 2 + +multipath -r +sleep 2 + +MPB=$(multipath -l | grep scsi_debug | cut -f1 -d ' ') +echo $MPB +MP=/dev/mapper/$MPB +echo $MP + +pvcreate $MP +vgcreate $vg1 $MP +lvcreate -l1 $vg1 +vgchange -an $vg1 + +pvs |tee out +grep $MP out +for i in $(grep -H scsi_debug /sys/block/sd*/device/model | cut -f4 -d /); do + not grep /dev/$i out; +done + +vgchange -an $vg1 +vgremove -y $vg1 + +sleep 2 +multipath -f $MP +sleep 1 +rmmod scsi_debug

1 0

main - display: ignore --reportformat
by David Teigland 17 Nov '21

17 Nov '21

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b8f4ec846d8f4f5256b27… Commit: b8f4ec846d8f4f5256b2737a6d6127482ef7b44e Parent: e4b8726b6d4ba9fc4b1f6e79339b1fecb2d890b0 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Nov 17 10:40:27 2021 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Nov 17 10:40:27 2021 -0600 display: ignore --reportformat Using the option would do nothing useful but would print extraneous braces. --- tools/command-lines.in | 12 ++++++------ tools/lvmcmdline.c | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/tools/command-lines.in b/tools/command-lines.in index d4691c686..6f431e233 100644 --- a/tools/command-lines.in +++ b/tools/command-lines.in @@ -1359,10 +1359,10 @@ OO: --aligned, --all, --binary, --colon, --columns, --configreport ConfigReport, --foreign, --history, --ignorelockingfailure, --logonly, --maps, --noheadings, --nosuffix, --options String, --sort String, --readonly, ---reportformat ReportFmt, --segments, --select String, --separator String, +--segments, --select String, --separator String, --shared, --unbuffered, --units Units OP: VG|LV|Tag ... -IO: --partial, --ignoreskippedcluster +IO: --partial, --ignoreskippedcluster, --reportformat ReportFmt ID: lvdisplay_general --- @@ -1590,10 +1590,10 @@ pvdisplay OO: --aligned, --all, --binary, --colon, --columns, --configreport ConfigReport, --foreign, --ignorelockingfailure, --logonly, --maps, --noheadings, --nosuffix, --options String, ---readonly, --reportformat ReportFmt, --select String, --separator String, --shared, +--readonly, --select String, --separator String, --shared, --short, --sort String, --unbuffered, --units Units OP: PV|Tag ... -IO: --ignoreskippedcluster +IO: --ignoreskippedcluster, --reportformat ReportFmt ID: pvdisplay_general --- @@ -1811,10 +1811,10 @@ vgdisplay OO: --activevolumegroups, --aligned, --binary, --colon, --columns, --configreport ConfigReport, --foreign, --ignorelockingfailure, --logonly, --noheadings, --nosuffix, ---options String, --readonly, --reportformat ReportFmt, --select String, +--options String, --readonly, --select String, --shared, --short, --separator String, --sort String, --unbuffered, --units Units OP: VG|Tag ... -IO: --partial, --ignoreskippedcluster +IO: --partial, --ignoreskippedcluster, --reportformat ReportFmt ID: vgdisplay_general --- diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index a28d98ecf..7e3afc241 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -3060,6 +3060,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) int i; int skip_hyphens; int refresh_done = 0; + int io; /* Avoid excessive access to /etc/localtime and set TZ variable for glibc * so it does not need to check /etc/localtime everytime that needs that info */ @@ -3142,6 +3143,20 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) if (!(cmd->command = _find_command(cmd, cmd->name, &argc, argv))) return EINVALID_CMD_LINE; + /* + * If option --foo is set which is listed in IO (ignore option) in + * command-lines.in, then unset foo. Commands won't usually use an + * ignored option, but there can be shared code that checks for --foo, + * and should not find it to be set. + */ + for (io = 0; io < cmd->command->io_count; io++) { + int opt = cmd->command->ignore_opt_args[io].opt; + if (arg_is_set(cmd, opt)) { + log_debug("Ignore opt %d", opt); + cmd->opt_arg_values[opt].count = 0; + } + } + /* * Remaining position args after command name and --options are removed. */

1 0

main - Revert "tests devicesfile-devname: remove searched_devnames"
by David Teigland 16 Nov '21

16 Nov '21

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e4b8726b6d4ba9fc4b1f6… Commit: e4b8726b6d4ba9fc4b1f6e79339b1fecb2d890b0 Parent: 5c71aa751048f99f4b599a01e7376d8ba951f793 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Nov 16 14:30:09 2021 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Nov 16 14:30:09 2021 -0600 Revert "tests devicesfile-devname: remove searched_devnames" This reverts commit 8e61c0ad6ecad5e0bcee09e44029e39396c1b59a. The changes from "device_id: searched_devnames improvements" allow this to work without the external removal. --- test/shell/devicesfile-devname.sh | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/test/shell/devicesfile-devname.sh b/test/shell/devicesfile-devname.sh index 1b881c1cb..a99fe3e9a 100644 --- a/test/shell/devicesfile-devname.sh +++ b/test/shell/devicesfile-devname.sh @@ -100,7 +100,6 @@ lvcreate -l4 -an -i2 -n $lv1 $vg1 sed -e "s|IDNAME=$dev1|IDNAME=$dev3|" "$ORIG" > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # pvs reports correct info pvs -o+uuid | tee pvs.out grep $vg1 pvs.out > out @@ -117,7 +116,6 @@ cat "$DF" sed -e "s|IDNAME=$dev1|IDNAME=$dev3|" "$ORIG" > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # lvcreate uses correct dev lvcreate -l1 -n $lv2 -an $vg1 "$dev1" # lvcreate fixed the DF @@ -137,7 +135,6 @@ cat "$DF" sed -e "s|IDNAME=$dev1|IDNAME=$dev3|" "$ORIG" > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # lvmdevices fixes the DF lvmdevices --update not grep "$PVID3" "$DF" @@ -150,7 +147,6 @@ cat "$DF" sed -e "s|IDNAME=$dev1|IDNAME=$dev2|" "$ORIG" > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # pvs reports correct info pvs -o+uuid | tee pvs.out grep $vg1 pvs.out > out @@ -167,7 +163,6 @@ cat "$DF" sed -e "s|IDNAME=$dev1|IDNAME=$dev2|" "$ORIG" > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # lvcreate uses correct dev lvcreate -l1 -n $lv2 -an $vg1 "$dev1" # lvcreate fixed the DF @@ -187,7 +182,6 @@ cat "$DF" sed -e "s|IDNAME=$dev1|IDNAME=$dev2|" "$ORIG" > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # lvmdevices fixes the DF lvmdevices --update grep "$PVID1" "$DF" |tee out @@ -202,7 +196,6 @@ sed -e "s|IDNAME=$dev1|IDNAME=tmpname|" "$ORIG" > tmp1.devices sed -e "s|IDNAME=$dev2|IDNAME=$dev1|" tmp1.devices > tmp2.devices sed -e "s|IDNAME=tmpname|IDNAME=$dev2|" tmp2.devices > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # pvs reports correct info pvs -o+uuid | tee pvs.out grep $vg1 pvs.out > out @@ -221,7 +214,6 @@ sed -e "s|IDNAME=$dev1|IDNAME=tmpname|" "$ORIG" > tmp1.devices sed -e "s|IDNAME=$dev2|IDNAME=$dev1|" tmp1.devices > tmp2.devices sed -e "s|IDNAME=tmpname|IDNAME=$dev2|" tmp2.devices > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # lvcreate uses correct dev lvcreate -l1 -n $lv2 -an $vg1 "$dev1" # lvcreate fixed the DF @@ -243,7 +235,6 @@ sed -e "s|IDNAME=$dev1|IDNAME=tmpname|" "$ORIG" > tmp1.devices sed -e "s|IDNAME=$dev2|IDNAME=$dev1|" tmp1.devices > tmp2.devices sed -e "s|IDNAME=tmpname|IDNAME=$dev2|" tmp2.devices > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # lvmdevices fixes the DF lvmdevices --update grep "$PVID1" "$DF" |tee out @@ -264,7 +255,6 @@ cat "$DF" sed -e "s|DEVNAME=$dev1|DEVNAME=$dev3|" "$ORIG" > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # pvs reports correct info pvs -o+uuid | tee pvs.out grep $vg1 pvs.out > out @@ -281,7 +271,6 @@ cat "$DF" sed -e "s|DEVNAME=$dev1|DEVNAME=$dev3|" "$ORIG" > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # lvmdevices fixes the DF lvmdevices --update not grep "$PVID3" "$DF" @@ -294,7 +283,6 @@ cat "$DF" sed -e "s|DEVNAME=$dev1|DEVNAME=$dev2|" "$ORIG" > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # pvs reports correct info pvs -o+uuid | tee pvs.out grep $vg1 pvs.out > out @@ -311,7 +299,6 @@ cat "$DF" sed -e "s|DEVNAME=$dev1|DEVNAME=$dev2|" "$ORIG" > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # lvmdevices fixes the DF lvmdevices --update grep "$PVID1" "$DF" |tee out @@ -326,7 +313,6 @@ sed -e "s|DEVNAME=$dev1|DEVNAME=tmpname|" "$ORIG" > tmp1.devices sed -e "s|DEVNAME=$dev2|DEVNAME=$dev1|" tmp1.devices > tmp2.devices sed -e "s|DEVNAME=tmpname|DEVNAME=$dev2|" tmp2.devices > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # pvs reports correct info pvs -o+uuid | tee pvs.out grep $vg1 pvs.out > out @@ -345,7 +331,6 @@ sed -e "s|DEVNAME=$dev1|DEVNAME=tmpname|" "$ORIG" > tmp1.devices sed -e "s|DEVNAME=$dev2|DEVNAME=$dev1|" tmp1.devices > tmp2.devices sed -e "s|DEVNAME=tmpname|DEVNAME=$dev2|" tmp2.devices > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # lvmdevices fixes the DF lvmdevices --update grep "$PVID1" "$DF" |tee out @@ -367,7 +352,6 @@ cat "$DF" sed -e "s|DEVNAME=$dev1|DEVNAME=$dev3|" "$ORIG" > tmp1.devices sed -e "s|IDNAME=$dev1|IDNAME=$dev3|" tmp1.devices > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # pvs reports correct info pvs -o+uuid | tee pvs.out grep $vg1 pvs.out > out @@ -386,7 +370,6 @@ cat "$DF" sed -e "s|DEVNAME=$dev1|DEVNAME=$dev3|" "$ORIG" > tmp1.devices sed -e "s|IDNAME=$dev1|IDNAME=$dev3|" tmp1.devices > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # lvmdevices fixes the DF lvmdevices --update not grep "$PVID3" "$DF" @@ -401,7 +384,6 @@ cat "$DF" sed -e "s|DEVNAME=$dev1|DEVNAME=$dev2|" tmp1.devices > "$DF" sed -e "s|IDNAME=$dev1|IDNAME=$dev2|" tmp1.devices > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # pvs reports correct info pvs -o+uuid | tee pvs.out grep $vg1 pvs.out > out @@ -421,7 +403,6 @@ cat "$DF" sed -e "s|DEVNAME=$dev1|DEVNAME=$dev2|" tmp1.devices > "$DF" sed -e "s|IDNAME=$dev1|IDNAME=$dev2|" tmp1.devices > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # lvmdevices fixes the DF lvmdevices --update grep "$PVID1" "$DF" |tee out @@ -441,7 +422,6 @@ sed -e "s|IDNAME=$dev1|IDNAME=tmpname|" tmp3.devices > tmp4.devices sed -e "s|IDNAME=$dev2|IDNAME=$dev1|" tmp4.devices > tmp5.devices sed -e "s|IDNAME=tmpname|IDNAME=$dev2|" tmp5.devices > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # pvs reports correct info pvs -o+uuid | tee pvs.out grep $vg1 pvs.out > out @@ -465,7 +445,6 @@ sed -e "s|IDNAME=$dev1|IDNAME=tmpname|" tmp3.devices > tmp4.devices sed -e "s|IDNAME=$dev2|IDNAME=$dev1|" tmp4.devices > tmp5.devices sed -e "s|IDNAME=tmpname|IDNAME=$dev2|" tmp5.devices > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true # lvmdevices fixes the DF lvmdevices --update grep "$PVID1" "$DF" |tee out @@ -489,7 +468,6 @@ cat "$DF" sed -e "s|DEVNAME=$dev1|DEVNAME=$dev3|" "$ORIG" > tmp1.devices sed -e "s|IDNAME=$dev1|IDNAME=$dev3|" tmp1.devices > "$DF" cat "$DF" -rm /run/lvm/searched_devnames || true _clear_online_files pvscan --cache -aay "$dev1" pvscan --cache -aay "$dev2" @@ -530,7 +508,6 @@ sed -e "s|IDNAME=tmpname|IDNAME=$dev2|" tmp5.devices > "$DF" cat "$DF" _clear_online_files -rm /run/lvm/searched_devnames || true # pvscan creates the correct online files and activates correct vg pvscan --cache -aay "$dev1"

1 0

main - tests pv-ext-flags: work with devices file
by David Teigland 16 Nov '21

16 Nov '21

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5c71aa751048f99f4b599… Commit: 5c71aa751048f99f4b599a01e7376d8ba951f793 Parent: 5c4ce4669eb8d8cacc095bd70871c13a4042e5af Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Nov 16 14:21:07 2021 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Nov 16 14:29:22 2021 -0600 tests pv-ext-flags: work with devices file --- test/shell/pv-ext-flags.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/shell/pv-ext-flags.sh b/test/shell/pv-ext-flags.sh index 3e6bcff76..ae4d6b7ff 100644 --- a/test/shell/pv-ext-flags.sh +++ b/test/shell/pv-ext-flags.sh @@ -57,9 +57,11 @@ dd if="$dev1" of=dev1_backup bs=1M # pvcreate and pvremove can be forced even if the PV is marked as used pvremove -ff -y "$dev1" +lvmdevices --deldev "$dev1" || true dd if=dev1_backup of="$dev1" bs=1M pvcreate -ff -y "$dev1" dd if=dev1_backup of="$dev1" bs=1M +lvmdevices --adddev "$dev1" || true # prepare a VG with $dev1 and $dev both having 1 MDA aux enable_dev "$dev2" @@ -116,9 +118,11 @@ dd if="$dev1" of=dev1_backup bs=1M # pvcreate and pvremove can be forced even if the PV is marked as used pvremove -ff -y "$dev1" +lvmdevices --deldev "$dev1" || true dd if=dev1_backup of="$dev1" bs=1M pvcreate -ff -y "$dev1" dd if=dev1_backup of="$dev1" bs=1M +lvmdevices --adddev "$dev1" || true # prepare a VG with $dev1 and $dev both having 1 MDA aux enable_dev "$dev2"

1 0

main - device_id: searched_devnames improvements
by David Teigland 16 Nov '21

16 Nov '21

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5c4ce4669eb8d8cacc095… Commit: 5c4ce4669eb8d8cacc095bd70871c13a4042e5af Parent: fee39370020424234bee1295cac480afeef72fd6 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Nov 16 11:26:41 2021 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Nov 16 14:29:17 2021 -0600 device_id: searched_devnames improvements Remove the searched_devnames file in a couple more places: . When hints need refreshing it's possible that a missing devices file entry could be found by searching devices again. . When a devices file entry devname is first found to be incorrect, a new search for missing entries may be useful. --- lib/device/device_id.c | 28 ++++++++++++++++++++++++++-- lib/label/hints.c | 10 ++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/lib/device/device_id.c b/lib/device/device_id.c index 7bcaf3df4..b6e31d0e7 100644 --- a/lib/device/device_id.c +++ b/lib/device/device_id.c @@ -74,6 +74,8 @@ void unlink_searched_devnames(struct cmd_context *cmd) if (unlink(_searched_file)) log_debug("unlink %s errno %d", _searched_file, errno); + else + log_debug("unlink %s", _searched_file); } static int _searched_devnames_exists(struct cmd_context *cmd) @@ -779,7 +781,7 @@ static void _device_ids_update_try(struct cmd_context *cmd) int held = 0; if (cmd->expect_missing_vg_device) { - log_print("skip updating devices file."); + log_print("Devices file update skipped."); return; } @@ -1440,8 +1442,22 @@ static int _match_du_to_dev(struct cmd_context *cmd, struct dev_use *du, struct const char *idname; int part; - if (!du->idname || !du->idtype) + /* + * The idname will be removed from an entry with devname type when the + * devname is read and found to hold a different PVID than the PVID in + * the entry. At that point we only have the PVID and no known + * location for it. + */ + if (!du->idname || !du->idtype) { + /* + log_debug("Mismatch device_id %s %s %s to %s", + du->idtype ? idtype_to_str(du->idtype) : "idtype_missing", + du->idname ? du->idname : "idname_missing", + du->devname ? du->devname : "devname_missing", + dev_name(dev)); + */ return 0; + } /* * Some idtypes can only match devices with a specific major number, @@ -1963,6 +1979,14 @@ void device_ids_validate(struct cmd_context *cmd, struct dm_list *scanned_devs, *device_ids_invalid = 1; } + /* + * When a new devname/pvid mismatch is discovered, a new search for the + * pvid should be permitted (searched_devnames may exist to suppress + * searching for other pvids.) + */ + if (update_file) + unlink_searched_devnames(cmd); + /* FIXME: for wrong devname cases, wait to write new until device_ids_find_renamed_devs? */ /* diff --git a/lib/label/hints.c b/lib/label/hints.c index 9a7c280eb..93dfdd5c1 100644 --- a/lib/label/hints.c +++ b/lib/label/hints.c @@ -1397,6 +1397,16 @@ int get_hints(struct cmd_context *cmd, struct dm_list *hints_out, int *newhints, log_debug("get_hints: needs refresh"); free_hints(&hints_list); + /* + * This is not related to hints, and is probably unnecessary, + * but it could possibly help. When hints become invalid it's + * usually becaues devs on the system have changed, and that + * also means that a missing devices file entry might be found + * by searching devices again. (the searched_devnames + * mechanism should eventually be replaced) + */ + unlink_searched_devnames(cmd); + if (!_lock_hints(cmd, LOCK_EX, NONBLOCK)) return 0;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits November 2021