lvm2-commits November 2022

lvm2-commits@lists.fedorahosted.org

4 participants
31 discussions

main - report: adjust lv_active_remotely for shared VGs
by David Teigland 11 Nov '22

11 Nov '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=779fc3c0453d4a1abdfc6… Commit: 779fc3c0453d4a1abdfc62db740517467dbaf0e3 Parent: c77384785d3bd3d0c265220395dc392b52e62218 Author: corubba <corubba(a)gmx.de> AuthorDate: Tue Nov 1 22:18:19 2022 +0100 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Nov 11 12:08:59 2022 -0600 report: adjust lv_active_remotely for shared VGs Add a note to the manpage that lvmlockd is unable to determine accurately and without side-effects whether a LV is remotely active. Also change the value of the lv_active_remotely option from false to undefined for shared VGs to distinctly communicate that inability to users. Only for local VGs it can be definitely stated that they are not remotely active. Signed-off-by: corubba <corubba(a)gmx.de> --- lib/report/report.c | 3 ++- man/lvmlockd.8_main | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/report/report.c b/lib/report/report.c index 9172c1f0e..cb5fc93c8 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -3838,9 +3838,10 @@ static int _lvactiveremotely_disp(struct dm_report *rh, struct dm_pool *mem, struct dm_report_field *field, const void *data, void *private) { + const struct logical_volume *lv = (const struct logical_volume *) data; int active_remotely; - if (!activation()) + if (!activation() || vg_is_shared(lv->vg)) return _binary_undef_disp(rh, mem, field, private); active_remotely = 0; diff --git a/man/lvmlockd.8_main b/man/lvmlockd.8_main index 717292dc6..7fa11df54 100644 --- a/man/lvmlockd.8_main +++ b/man/lvmlockd.8_main @@ -878,6 +878,10 @@ If lvmlockd fails or is killed while in use, locks it held remain but are orphaned in the lock manager. lvmlockd can be restarted with an option to adopt the orphan locks from the previous instance of lvmlockd. . +.IP \[bu] +The 'lvs' command does not report any remote state, because lvmlockd is +unable to passively check the remote active or lock state of an LV. +. .SH SEE ALSO . .BR lvm (8),

1 0

v2_03_17 annotated tag has been created
by Marian Csontos 10 Nov '22

10 Nov '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0ea00227b96a383479139… Commit: 0ea00227b96a383479139e72db9168448eee48c9 Parent: 0000000000000000000000000000000000000000 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: 2022-11-10 13:11 +0000 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: 2022-11-10 13:11 +0000 annotated tag: v2_03_17 has been created at 0ea00227b96a383479139e72db9168448eee48c9 (tag) tagging f8127c45c5fa8fc8e163565bfa2001a0bb8ae72e (commit) replaces v2_03_16 Release 2.03.17 Major feature is rework of lvresize (lvextend, lvreduce) handling of nested file systems. New --fs and --fsmode options, see lvresize(8). May bugfixes and improvements, noteworthy to lvmdbusd, VDO, and device_id. -----BEGIN PGP SIGNATURE----- iQJIBAABCAAyFiEE1QGkeEQK4v0TChvouREkMeUJA58FAmNs+JYUHG1jc29udG9z QHJlZGhhdC5jb20ACgkQuREkMeUJA581/xAAoHPtvCyP/j9BChRLGqHKlmozYzbf 6CQlajiO+Kpj81LRSM+KeszzUFeaTBu2K65ca4bTecr/XKT8gmrWlPpuF9x35o4q R500RlCQ1yXOPonCvzKSctVU7WH2OGlSOOGooTA+6GiZsQMwmluEUwYZb40BlwDl Xz7trb/VP0N5WmO9wq1IY0iKPFCRb8QCYviL9vik3r6JQrTJ6pZF8wFKbujocC36 V5LTZWLrNzh+B6GVfAyssrLAy8BUleZdX80FiCnZfbC8vlU142AmJ/FG6VFQKOJ6 y13lLuClL6zBkk0VnVgyiw2+Gt6/ETuiek2us3y91MddnWwiUuxdLtAXzXHTl53v OOIroqyJFHbccAg+koyB2XK3FtugB4g5FLUjdphbfJbAiq3ArUF09f+kRnwPClfu P0Ju5RL7SP41WPY8ovjZZiXU7gl7886S66n5Wpd3AubaIHLFqKRepQK+bMN9tqOX bGBXfvfbRwZBzZm1nLLhq8/c5hQYt/FfG6HRC80NZbXqOiuUVN+kPn9/r2eSSBoC ruj3NLe23dS60xkhpGL1sC16Tzjpr7q+RQ8JcMSf7i46MwIAw3Zrt3fHc6+pPNnK BWH7ePrsPBVIFWpS4EEr/fkgiDTYWMB48cr4UnmE/dGZWXeBKBdgJxXu4BOVWUTO uDMN3ohSzbvaqQk= =wqjW -----END PGP SIGNATURE----- David Teigland (42): devices file: move clean up after command is run devices file: fail if --devicesfile filename doesn't exist filter-mpath: handle other wwid types in blacklist filter-mpath: get wwids from sysfs vpd_pg83 pvdisplay: restore --reportformat option exit with error when --devicesfile name doesn't exist apply multipath_component_detection=0 to duplicate PV handling devices file: fix pvcreate --uuid matching pvid entry with no device id vgimportdevices: change result when devices are not added vgimportdevices: fix locking when creating devices file fix fs block size detection remove libblkid flag BLKID_SUBLKS_FSINFO lvresize: restructure code lvresize: add new options and defaults for fs handling tests: skip new lvresize tests when missing new libblkid vgremove: remove online files in run dir covscan: free wwid strings in lvmcache make: move cmds.h lvreduce: use temporary flag when activating lv to check for fs change messages about libblkid features remove unused variables lvresize: let env var set lvresize_fs_helper_path lvresize: exclude new fs handling at build time lvresize: give special advice to reiserfs users blkid: fix BLKID_SUBLKS_FSINFO usage lvresize: move the lockd_lv earlier device id wwid adjustments device id: change space handling in t10 wwid device id: add new types using values from vpd_pg83 tests: device ids using vpd data lvmdevices: use deviceidtype option strictly tests: skip lvresize tests without mkfs.xfs lvmlockd: fix warning tests: add comments to fsadm-renamed lvreduce: require active LV when no fs option is used lvreduce: change error message about --fs options cmd: save device_id_sysfs_dir device_id: remove debug trace vgchange systemid: use tag or select device_id: look for serial number in other locations device_id: handle duplicate serial numbers devices: factor common list functions Lidong Zhong (1): lvmlockd: purge the lock resources left in previous lockspace Marian Csontos (10): post-release spec: Use libedit for newer distributions configure: fix typo spec: use --with-default-use-devices-file=1 for rhel9+ config: add correct unconfigured value for use_devicesfile configure: update spec: Workaround for failing build make: Fix build in chroot make: generate pre-release Peter Rajnoha (24): shell: also output error message about max number of args hit with JSON format libdm: report: add DM_REPORT_GROUP_JSON_STD group libdm: report: remove double quotes around numeric values in JSON_STD output libdm: report: use 'null' for undefined numeric values in JSON_STD output libdm: report: enhance the way string list is stored internally libdm: report: separate basic and JSON+JSON_STD format in _output_field libdm: report: use proper JSON array for string list output in JSON_STD format config: recognize 'json_std' for report/output_format config setting args: recognize 'json_std' for --reportformat cmd line arg man: update lvmreport man page about json_std format make: generate report: fix pe_start column type from NUM to SIZ test: add report-format test WHATS_NEW: update report: report numeric values (not string synonyms) for NUM and BIN fields with json_std format lvmconfig: add --valuesonly option config: remove unnecessary copy of config line's space prefix before printing config: check for possible mempool errors in _out_line_fn shell: add pre-cmd log report object type and enable lastlog for it libdm: report: fix escaping of JSON quote char in reported fields args: add ARG_NONINTERACTIVE for cmds not supported in lvm shell report: values: add note about self-decriptive values to report report: fix lv_active column type from STR to BIN toollib: do not process just created historical LV Tony Asleson (85): lvmdbusd: Correct conditional for lvm child process running lvmdbusd: Simplify child process env lvmdbusd: re-work lvm shell main lvmdbusd: Add debug output for which lvm binary is used lvmdbusd: Change unit test vdo minimum size lvmdbusd: Fix env variable LVM_DBUSD_TEST_MODE lvmdbusd: Remove the use of sub shell for lvm shell lvmdbusd: Job prop. Get/GetAll exec. immediately lvmdbusd: Don't require "lvm> " prompt for shell lvmdbusd: Correct grammar in lvm shell proxy comments lvmdbustest: Test job remove path when job not complete lvmdbustest: Correct comment spelling/grammar lvmdbustest: Increase number of LVs lvmdusd: Remove non lvm JSON output support lvmdbusd: Remove try/except for mkfifo lvmdbustest: Add test for property "Get" lvmdbustest: Use updated pyudev syntax lvmdbustest: Include major number 259 lvmdbusd: Remove addl. checks on --nojson lvmdbusd: Move arg. setup/checking to function lvmdbusd: Add lockfile lvmdbustest: Remove force exception in _wait_for_job lvmdbusd: Re-work flight recorder data lvmdbusd: Add SIGUSR2 to dump flight recorder lvmdbusd: Remove unneeded command line args lvmdbusd: Remove exclusionary language lvmdbustest: nesting improvements lvmdbusd: Handle no lastlog lvmdbusd: Correct typos lvmdbusd: Make sure to set cfg.got_external_event lvmdbusd: Remove unused locking functionality lvmdbustest: Add test for passing log file in options lvmdbustest: Add test for external event lvmdbustest: Add test removing incomplete job lvmdbusd: fix hangs on SIGINT lvmdbusd: Correct typos lvmdbustest: Add DaemonInfo class lvmdbustest: Factor out tearDown implementation for re-use lvmdbustest: Add optional option to _create_num_lvs lvmdbustest: Add test_sigint test lvmdbustest: Add test for ensuring only 1 instance of daemon lvmdbustest: Add systemctl daemon start lvmdbusd: Set LVM_COMMAND_PROFILE=lvmdbusd lvmdbustest: Skip test_singleton_daemon running systemd svc. lvmdbusd: Add debug circular buffer lvmdbusd: WS, imports, grammar lvmdbusd: Don't report recoverable error lvmdbusd: Handle SIGINT quietly lvmdbusd: Re-work error handling for run_cmd lvmdbusd: refactor and correct fetch thread logic lvmdbustest: Skip test_nesting if scan_lvs is not enabled lvmdbusd: Don't output debug for fullreport exit code 5 lvmdbusd: Use common function for traceback lvmdbusd: Re-work error handling lvmdbusd: Instruct lvm to output debug to file for fullreport lvmdbusd: Raise LvmBug exception for invalid JSON lvmdbusd: Remove duplicate code lvmdbustest: Utilize addCleanup in unit test lvmdbusd: Remove PID from log messages lvmdbusd: Use pseudo tty to get "lvm>" prompt again lvmdbusd: Handle 'exit' for lvm_shell_proxy lvmdbustest: Move signals to last lvmdbustest: Check for self.pvs lvmdbusd: Correct undefined var lvmdbusd: Use common func. for checking missing LV keys lvmdbusd: Check for KeyError in refresh lvmdbusd: Correct log_error for shell proxy lvmdbusd: Raise IOError instead of ignoring lvmdbusd: Call readlines instead of readline lvmdbusd: Include lvm debug output for lvmshell lvmdbustest: Add wrapper for injecting errors lvmdbusd: Remove --reportformat lvmdbusd: Correct get_object_path_by_uuid_lvm_id lvmdbusd: Register for SIGTERM lvmdbusd: Correct lvm shell signal & child process handling lvmdbustest: Make vg name suffix more unique lvmdbustest: Refuse to remove a VG we didn't create lvmdbustest: Re-work setUp lvmdbustest: Add test to stress mode changing lvmdbusd: Correct env. variable lvmnotify.c: Check to see if dbus daemon is running lvmdbustest: Add test for wipefs lvmdbusd: Always leverage udev lvmdbustest: Add test for copy signature lvmdbusd: Handle PV signature copy Wu Guanghao (1): _vg_read_raw_area: fix segfault caused by using null pointer Zdenek Kabelac (64): vdo: fix conversion of vdo_slab_size_mb tests: add lvm_vdo_wrapper tests: update for wrapper tests: skip running tests for non root user vdo: fix conversion of vdo_slab_size_mb 2nd man: space after size vdo: use single validator vdo: update info about memory vdo: use defines also for configuration defines vdo: report supported range in error path vdo: check vdo memory constrains vdo: add reformating to extent size aligned virtual size vdo: support v4 kernel target line vdo: enhance lvcreate validation vdo: suffle code for better error path handling cov: remove unused headers cov: restore disable_dm_devs also for error path make: generate lvconvert: correct test support for vdo-pool vdo: use only verbose log level for reformating vdo: fix --vdosettings parser autoreconf: support newer archs vdo: reset errno before strtoull vdo: extend volume and pool without flush mm: remove libaio from being skipped dmsetup: check also for ouf of range value devices: drop double // from sysfs path thin: rename internal function configure: check for mallinfo2 configure: remove some obsolete or duplicate checks mm: preallocate memory only with glibc mm: use mallinfo2 when available gcc: eliminate warnings python: variable without destdir make: update make.tmpl tests: rework makefile tests: vdo emulation without vdo binary tests: skip this test for 5.19 tests: remove slash tests: check for at least 1G of RAM tests: make damage optional tests: no caching for blkid in testing tests: lvextend update for 300M XFS tests: add thin requirement tests: add /dev requirement tests: use conv=fdatasync tests: writecache adapt to 300M XFS tests: fsadm 300m xfs tests: cache use 300M XFS gitignore: update tests: integrity switch to ext4 makefiles: use single libs definition tests: discard update tests: validate CONFIG_HZ_1000 make: generate configure: update use_devicesfile in example.conf device_mapper: add parser for vdo metadata dev_manager: accept misalined vdo pools. device_mapper: vdo V4 avoid messaging vdo: replace errors with debug vdo: enhance detection of virtual size tests: update test to handle different status lvcreate: fix error path return values vdo: improve validation message corubba (1): lvmlockd: Fix sanlock lvmlock lv size calculation

1 0

main - post-release
by Marian Csontos 10 Nov '22

10 Nov '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=c77384785d3bd3d0c2652… Commit: c77384785d3bd3d0c265220395dc392b52e62218 Parent: f8127c45c5fa8fc8e163565bfa2001a0bb8ae72e Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Thu Nov 10 14:21:57 2022 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Thu Nov 10 14:21:57 2022 +0100 post-release --- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 3 +++ WHATS_NEW_DM | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index d011ad748..b5c261028 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.03.17(2) (2022-11-10) +2.03.18(2)-git (2022-11-10) diff --git a/VERSION_DM b/VERSION_DM index 3f4240a76..c1923fa3a 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.187 (2022-11-10) +1.02.189-git (2022-11-10) diff --git a/WHATS_NEW b/WHATS_NEW index 2f4ffd894..613acfa86 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,3 +1,6 @@ +Version 2.03.18 - +==================================== + Version 2.03.17 - 10th November 2022 ==================================== Add new options (--fs, --fsmode) for FS handling when resizing LVs. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index f676ff7e1..1067312d3 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,3 +1,6 @@ +Version 1.02.189 - +===================================== + Version 1.02.187 - 10th November 2022 ===================================== Add DM_REPORT_GROUP_JSON_STD for more JSON standard compliant output format.

1 0

main - pre-release
by Marian Csontos 10 Nov '22

10 Nov '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f8127c45c5fa8fc8e1635… Commit: f8127c45c5fa8fc8e163565bfa2001a0bb8ae72e Parent: 6b96bf7bc2f548e7ce1de879251c8b90ab40b634 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Thu Nov 10 10:23:38 2022 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Thu Nov 10 14:11:32 2022 +0100 pre-release --- VERSION | 2 +- VERSION_DM | 2 +- WHATS_NEW | 7 +++++-- WHATS_NEW_DM | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index 7f1382bbe..d011ad748 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.03.17(2)-git (2022-05-18) +2.03.17(2) (2022-11-10) diff --git a/VERSION_DM b/VERSION_DM index 35b742cd4..3f4240a76 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.187-git (2022-05-18) +1.02.187 (2022-11-10) diff --git a/WHATS_NEW b/WHATS_NEW index 2942b0e53..2f4ffd894 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ -Version 2.03.17 - -=============================== +Version 2.03.17 - 10th November 2022 +==================================== + Add new options (--fs, --fsmode) for FS handling when resizing LVs. Fix 'lvremove -S|--select LV' to not also remove its historical LV right away. Fix lv_active field type to binary so --select and --binary applies properly. Switch to use mallinfo2 and use it only with glibc. @@ -11,6 +12,8 @@ Version 2.03.17 - Fix lvconvert --test --type vdo-pool execution. Add json_std output format for more JSON standard compliant version of output. Fix vdo_slab_size_mb value for converted VDO volume. + Fix many corner cases in device_id, including handling of S/N duplicates. + Fix various issues in lvmdbusd. Version 2.03.16 - 18th May 2022 =============================== diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 6856f4302..f676ff7e1 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,5 @@ -Version 1.02.187 - -================================ +Version 1.02.187 - 10th November 2022 +===================================== Add DM_REPORT_GROUP_JSON_STD for more JSON standard compliant output format. Version 1.02.185 - 18th May 2022

1 0

main - make: generate
by Marian Csontos 10 Nov '22

10 Nov '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6b96bf7bc2f548e7ce1de… Commit: 6b96bf7bc2f548e7ce1de879251c8b90ab40b634 Parent: 403779333be419352d6062da592ea78e6096e12b Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Thu Nov 10 09:57:57 2022 +0100 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Thu Nov 10 13:58:09 2022 +0100 make: generate --- man/vgchange.8_pregen | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen index 9df1ef733..7fa1cbb10 100644 --- a/man/vgchange.8_pregen +++ b/man/vgchange.8_pregen @@ -342,10 +342,12 @@ Reactivate LVs using the latest metadata. Change the system ID of a VG. .br .P -\fBvgchange\fP \fB--systemid\fP \fIString\fP \fIVG\fP +\fBvgchange\fP \fB--systemid\fP \fIString\fP \fIVG\fP|\fITag\fP|\fISelect\fP .br .RS 4 .ad l +[ \fB-S\fP|\fB--select\fP \fIString\fP ] +.br [ COMMON_OPTIONS ] .ad b .RE

1 0

rhel-8.8.0 - vgimportdevices: fix locking when creating devices file
by David Teigland 08 Nov '22

08 Nov '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=19093e37557ae6a94392d… Commit: 19093e37557ae6a94392dcf207b3566a7d3defea Parent: e5f5e2988377c0f014b30a60709685c19c6d3bf0 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Aug 30 14:40:48 2022 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Nov 2 13:24:18 2022 -0500 vgimportdevices: fix locking when creating devices file Take the devices file lock before creating a new devices file. (Was missed by the change to preemptively create the devices file prior to setup_devices(), which was done to improve the error path.) --- lib/device/dev-cache.c | 7 +++---- lib/device/device_id.c | 1 + tools/vgimportdevices.c | 10 ++++++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index 65e1cb138..0c9aaf785 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -1956,10 +1956,9 @@ static int _setup_devices(struct cmd_context *cmd, int no_file_match) if (!file_exists) { /* - * pvcreate/vgcreate/vgimportdevices/lvmdevices-add create - * a new devices file here if it doesn't exist. - * They have the create_edit_devices_file flag set. - * First they create/lock-ex the devices file lockfile. + * pvcreate/vgcreate create a new devices file here if it + * doesn't exist. They have create_edit_devices_file=1. + * First create/lock-ex the devices file lockfile. * Other commands will not use a devices file if none exists. */ lock_mode = LOCK_EX; diff --git a/lib/device/device_id.c b/lib/device/device_id.c index c3816a66c..780e08404 100644 --- a/lib/device/device_id.c +++ b/lib/device/device_id.c @@ -2429,6 +2429,7 @@ static int _lock_devices_file(struct cmd_context *cmd, int mode, int nonblock, i if (_devices_file_locked == mode) { /* can happen when a command holds an ex lock and does an update in device_ids_validate */ + /* can happen when vgimportdevices calls this directly, followed later by setup_devices */ if (held) *held = 1; return 1; diff --git a/tools/vgimportdevices.c b/tools/vgimportdevices.c index 9ade1b9e4..23c2718ff 100644 --- a/tools/vgimportdevices.c +++ b/tools/vgimportdevices.c @@ -132,8 +132,10 @@ int vgimportdevices(struct cmd_context *cmd, int argc, char **argv) return ECMD_FAILED; /* - * Prepare devices file preemptively because the error path for this - * case from process_each is not as clean. + * Prepare/create devices file preemptively because the error path for + * this case from process_each/setup_devices is not as clean. + * This means that when setup_devices is called, it the devices + * file steps will be redundant, and need to handle being repeated. */ if (!setup_devices_file(cmd)) { log_error("Failed to set up devices file."); @@ -143,6 +145,10 @@ int vgimportdevices(struct cmd_context *cmd, int argc, char **argv) log_error("Devices file not enabled."); return ECMD_FAILED; } + if (!lock_devices_file(cmd, LOCK_EX)) { + log_error("Failed to lock the devices file."); + return ECMD_FAILED; + } if (!devices_file_exists(cmd)) { if (!devices_file_touch(cmd)) { log_error("Failed to create devices file.");

1 0

rhel-8.8.0 - vgimportdevices: change result when devices are not added
by David Teigland 08 Nov '22

08 Nov '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e5f5e2988377c0f014b30… Commit: e5f5e2988377c0f014b30a60709685c19c6d3bf0 Parent: 87904fbbb84c10e6f733db1c5ba447537d1cf08c Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Aug 29 15:17:36 2022 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Nov 2 13:24:12 2022 -0500 vgimportdevices: change result when devices are not added When using --all, if one VG is skipped, continue adding other VGs, and do not return an error from the command if some VGs are added. (A VG is skipped if it's missing PVs.) If the command fails during devices file setup or device scanning, then remove the devices file if it has been newly created by the command, and exit with an error. If devices from a named VG are not imported (e.g. the VG is missing devices), then remove the devices file if it has been newly created by the command, and exit with an error. If --all VGs are being imported, and no devices are found to include in the devices file, then remove the devices file if it has been newly created by the command, and exit with an error. --- test/shell/vgimportdevices.sh | 308 ++++++++++++++++++++++++++++++++++++++++++ tools/vgimportdevices.c | 41 ++++-- 2 files changed, 336 insertions(+), 13 deletions(-) diff --git a/test/shell/vgimportdevices.sh b/test/shell/vgimportdevices.sh new file mode 100644 index 000000000..47363cec3 --- /dev/null +++ b/test/shell/vgimportdevices.sh @@ -0,0 +1,308 @@ + +#!/usr/bin/env bash + +# Copyright (C) 2020 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='vgimportdevices' + +. lib/inittest + +aux prepare_devs 5 + +DFDIR="$LVM_SYSTEM_DIR/devices" +mkdir "$DFDIR" || true +DF="$DFDIR/system.devices" + +aux lvmconf 'devices/use_devicesfile = 1' + +not ls "$DF" +pvcreate "$dev1" +ls "$DF" +grep "$dev1" "$DF" +rm -f "$DF" +dd if=/dev/zero of="$dev1" bs=1M count=1 + +# +# vgimportdevices -a with no prev df +# + +# no devs found +not vgimportdevices -a +not ls "$DF" + +# one orphan pv, no vgs +pvcreate "$dev1" +rm -f "$DF" +not vgimportdevices -a +not ls "$DF" + +# one complete vg +vgcreate $vg1 "$dev1" +rm -f "$DF" +vgimportdevices -a +ls "$DF" +grep "$dev1" "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +rm -f "$DF" + +# two complete vgs +vgcreate $vg1 "$dev1" +vgcreate $vg2 "$dev2" +rm -f "$DF" +vgimportdevices -a +ls "$DF" +grep "$dev1" "$DF" +grep "$dev2" "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +dd if=/dev/zero of="$dev2" bs=1M count=1 +rm -f "$DF" + +# one incomplete vg +vgcreate $vg1 "$dev1" "$dev2" +lvcreate -l1 -an $vg1 +rm -f "$DF" +dd if=/dev/zero of="$dev1" bs=1M count=1 +not vgimportdevices -a +not ls "$DF" +vgs $vg1 +pvs "$dev2" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +dd if=/dev/zero of="$dev2" bs=1M count=1 +rm -f "$DF" + +# three complete, one incomplete vg +vgcreate $vg1 "$dev1" +vgcreate $vg2 "$dev2" +vgcreate $vg3 "$dev3" +vgcreate $vg4 "$dev4" "$dev5" +rm -f "$DF" +dd if=/dev/zero of="$dev5" bs=1M count=1 +vgimportdevices -a +ls "$DF" +grep "$dev1" "$DF" +grep "$dev2" "$DF" +grep "$dev3" "$DF" +not grep "$dev4" "$DF" +not grep "$dev5" "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +dd if=/dev/zero of="$dev2" bs=1M count=1 +dd if=/dev/zero of="$dev3" bs=1M count=1 +dd if=/dev/zero of="$dev4" bs=1M count=1 +rm -f "$DF" + + +# +# vgimportdevices -a with existing df +# + +# no devs found +vgcreate $vg1 "$dev1" +grep "$dev1" "$DF" +dd if=/dev/zero of="$dev1" bs=1M count=1 +not vgimportdevices -a +ls "$DF" + +# one complete vg +vgcreate $vg1 "$dev1" +vgimportdevices -a +grep "$dev1" "$DF" +vgcreate --devicesfile "" $vg2 "$dev2" +not grep "$dev2" "$DF" +vgimportdevices -a +grep "$dev1" "$DF" +grep "$dev2" "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +dd if=/dev/zero of="$dev2" bs=1M count=1 +rm -f "$DF" + +# two complete vgs +vgcreate --devicesfile "" $vg1 "$dev1" +vgcreate --devicesfile "" $vg2 "$dev2" +rm -f "$DF" +vgimportdevices -a +ls "$DF" +grep "$dev1" "$DF" +grep "$dev2" "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +dd if=/dev/zero of="$dev2" bs=1M count=1 +rm -f "$DF" + +# one incomplete vg +vgcreate $vg1 "$dev1" +vgimportdevices -a +grep "$dev1" "$DF" +dd if=/dev/zero of="$dev1" bs=1M count=1 +vgcreate --devicesfile "" $vg2 "$dev2" "$dev3" +not grep "$dev2" "$DF" +not grep "$dev3" "$DF" +dd if=/dev/zero of="$dev2" bs=1M count=1 +not vgimportdevices -a +ls "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +dd if=/dev/zero of="$dev2" bs=1M count=1 +dd if=/dev/zero of="$dev3" bs=1M count=1 +rm -f "$DF" + +# import the same vg again +vgcreate --devicesfile "" $vg1 "$dev1" +not ls "$DF" +vgimportdevices -a +ls "$DF" +grep "$dev1" "$DF" +vgimportdevices -a +ls "$DF" +grep "$dev1" "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +rm -f "$DF" + +# import a series of vgs +vgcreate --devicesfile "" $vg1 "$dev1" +vgimportdevices -a +grep "$dev1" "$DF" +vgcreate --devicesfile "" $vg2 "$dev2" +vgimportdevices -a +grep "$dev1" "$DF" +grep "$dev2" "$DF" +vgcreate --devicesfile "" $vg3 "$dev3" +vgimportdevices -a +grep "$dev1" "$DF" +grep "$dev2" "$DF" +grep "$dev3" "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +dd if=/dev/zero of="$dev2" bs=1M count=1 +dd if=/dev/zero of="$dev3" bs=1M count=1 +rm -f "$DF" + +# +# vgimportdevices vg with no prev df +# + +# no devs found +not vgimportdevices $vg1 +not ls "$DF" + +# one complete vg +vgcreate $vg1 "$dev1" +rm -f "$DF" +vgimportdevices $vg1 +ls "$DF" +grep "$dev1" "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +rm -f "$DF" + +# two complete vgs +vgcreate $vg1 "$dev1" +vgcreate $vg2 "$dev2" +rm -f "$DF" +vgimportdevices $vg1 +ls "$DF" +grep "$dev1" "$DF" +vgimportdevices $vg2 +ls "$DF" +grep "$dev2" "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +dd if=/dev/zero of="$dev2" bs=1M count=1 +rm -f "$DF" + +# one incomplete vg +vgcreate $vg1 "$dev1" "$dev2" +lvcreate -l1 -an $vg1 +rm -f "$DF" +dd if=/dev/zero of="$dev1" bs=1M count=1 +not vgimportdevices $vg1 +not ls "$DF" +vgs $vg1 +pvs "$dev2" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +dd if=/dev/zero of="$dev2" bs=1M count=1 +rm -f "$DF" + +# three complete, one incomplete vg +vgcreate $vg1 "$dev1" +vgcreate $vg2 "$dev2" +vgcreate $vg3 "$dev3" +vgcreate $vg4 "$dev4" "$dev5" +rm -f "$DF" +dd if=/dev/zero of="$dev5" bs=1M count=1 +not vgimportdevices $vg4 +not ls "$DF" +vgimportdevices $vg3 +ls "$DF" +grep "$dev3" "$DF" +not grep "$dev1" "$DF" +not grep "$dev2" "$DF" +not grep "$dev4" "$DF" +not grep "$dev5" "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +dd if=/dev/zero of="$dev2" bs=1M count=1 +dd if=/dev/zero of="$dev3" bs=1M count=1 +dd if=/dev/zero of="$dev4" bs=1M count=1 +rm -f "$DF" + +# +# vgimportdevices vg with existing df +# + +# vg not found +vgcreate $vg1 "$dev1" +vgimportdevices -a +grep "$dev1" "$DF" +not vgimportdevices $vg2 +grep "$dev1" "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +rm -f "$DF" + +# vg incomplete +vgcreate $vg1 "$dev1" +vgimportdevices -a +grep "$dev1" "$DF" +vgcreate --devicesfile "" $vg2 "$dev2" "$dev3" +dd if=/dev/zero of="$dev2" bs=1M count=1 +not vgimportdevices $vg2 +grep "$dev1" "$DF" +not grep "$dev2" "$DF" +not grep "$dev3" "$DF" + +# reset +dd if=/dev/zero of="$dev1" bs=1M count=1 +dd if=/dev/zero of="$dev2" bs=1M count=1 +dd if=/dev/zero of="$dev3" bs=1M count=1 +dd if=/dev/zero of="$dev4" bs=1M count=1 +rm -f "$DF" + diff --git a/tools/vgimportdevices.c b/tools/vgimportdevices.c index ea205d941..9ade1b9e4 100644 --- a/tools/vgimportdevices.c +++ b/tools/vgimportdevices.c @@ -36,9 +36,9 @@ static int _vgimportdevices_single(struct cmd_context *cmd, dm_list_iterate_items(pvl, &vg->pvs) { if (is_missing_pv(pvl->pv) || !pvl->pv->dev) { memcpy(pvid, &pvl->pv->id.uuid, ID_LEN); - log_error("Not importing devices for VG %s with missing PV %s.", - vg->name, pvid); - goto bad; + log_print("Not importing devices for VG %s with missing PV %s.", + vg->name, pvid); + return ECMD_PROCESSED; } } @@ -71,14 +71,17 @@ static int _vgimportdevices_single(struct cmd_context *cmd, updated_pvs++; } + /* + * Writes the device_id of each PV into the vg metadata. + * This is not a critial step and should not influence + * the result of the command. + */ if (updated_pvs) { if (!vg_write(vg) || !vg_commit(vg)) - goto_bad; + log_print("Failed to write device ids in VG metadata."); } return ECMD_PROCESSED; -bad: - return ECMD_FAILED; } /* @@ -114,6 +117,7 @@ int vgimportdevices(struct cmd_context *cmd, int argc, char **argv) { struct vgimportdevices_params vp = { 0 }; struct processing_handle *handle; + int created_file = 0; int ret = ECMD_FAILED; if (arg_is_set(cmd, foreign_ARG)) @@ -139,9 +143,12 @@ int vgimportdevices(struct cmd_context *cmd, int argc, char **argv) log_error("Devices file not enabled."); return ECMD_FAILED; } - if (!devices_file_exists(cmd) && !devices_file_touch(cmd)) { - log_error("Failed to create devices file."); - return ECMD_FAILED; + if (!devices_file_exists(cmd)) { + if (!devices_file_touch(cmd)) { + log_error("Failed to create devices file."); + return ECMD_FAILED; + } + created_file = 1; } /* @@ -195,22 +202,30 @@ int vgimportdevices(struct cmd_context *cmd, int argc, char **argv) */ ret = process_each_vg(cmd, argc, argv, NULL, NULL, READ_FOR_UPDATE, 0, handle, _vgimportdevices_single); - if (ret == ECMD_FAILED) - goto out; + if (ret == ECMD_FAILED) { + /* + * Error from setting up devices file or label_scan, + * _vgimportdevices_single does not return an error. + */ + goto_out; + } if (!vp.added_devices) { - log_print("No devices to add."); + log_error("No devices to add."); + ret = ECMD_FAILED; goto out; } if (!device_ids_write(cmd)) { - log_print("Failed to update devices file."); + log_error("Failed to write the devices file."); ret = ECMD_FAILED; goto out; } log_print("Added %u devices to devices file.", vp.added_devices); out: + if ((ret == ECMD_FAILED) && created_file) + unlink(cmd->devices_file_path); destroy_processing_handle(cmd, handle); return ret; }

1 0

rhel-8.8.0 - devices file: fix pvcreate --uuid matching pvid entry with no device id
by David Teigland 08 Nov '22

08 Nov '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=87904fbbb84c10e6f733d… Commit: 87904fbbb84c10e6f733db1c5ba447537d1cf08c Parent: 377ed7d9bac948e1be97e78aa9f9e525e9af470d Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Aug 19 13:31:22 2022 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Nov 2 13:23:52 2022 -0500 devices file: fix pvcreate --uuid matching pvid entry with no device id pvcreate with --uuid would segfault if a devices file entry matched the specified pvid, but the devices file entry had no device_id, which could happen if the entry has a devname idtype. --- lib/device/device_id.c | 7 ++++--- test/shell/devicesfile-devname.sh | 13 +++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lib/device/device_id.c b/lib/device/device_id.c index 4d8fa5c9c..c3816a66c 100644 --- a/lib/device/device_id.c +++ b/lib/device/device_id.c @@ -1142,8 +1142,9 @@ id_done: du_devname->devname); if (du_pvid && (du_pvid->dev != dev)) - log_warn("WARNING: adding device %s with PVID %s which is already used for %s.", - dev_name(dev), pvid, du_pvid->dev ? dev_name(du_pvid->dev) : "missing device"); + log_warn("WARNING: adding device %s with PVID %s which is already used for %s device_id %s.", + dev_name(dev), pvid, du_pvid->dev ? dev_name(du_pvid->dev) : "missing device", + du_pvid->idname ?: "none"); if (du_devid && (du_devid->dev != dev)) { if (!du_devid->dev) { @@ -1189,7 +1190,7 @@ id_done: else check_idname = device_id_system_read(cmd, dev, du_pvid->idtype); - if (check_idname && !strcmp(check_idname, du_pvid->idname)) { + if (!du_pvid->idname || (check_idname && !strcmp(check_idname, du_pvid->idname))) { update_du = du_pvid; dm_list_del(&update_du->list); update_matching_kind = "PVID"; diff --git a/test/shell/devicesfile-devname.sh b/test/shell/devicesfile-devname.sh index 338637275..211f4dbed 100644 --- a/test/shell/devicesfile-devname.sh +++ b/test/shell/devicesfile-devname.sh @@ -550,6 +550,19 @@ vgchange -an $vg2 vgremove -ff $vg1 vgremove -ff $vg2 +# bz 2119473 + +aux lvmconf "devices/search_for_devnames = \"none\"" +sed -e "s|DEVNAME=$dev1|DEVNAME=.|" "$ORIG" > tmp1.devices +sed -e "s|IDNAME=$dev1|IDNAME=.|" tmp1.devices > "$DF" +pvs +lvmdevices +pvcreate -ff --yes --uuid "$PVID1" --norestorefile $dev1 +grep "$PVID1" "$DF" |tee out +grep "DEVNAME=$dev1" out +grep "IDNAME=$dev1" out +aux lvmconf "devices/search_for_devnames = \"auto\"" + # devnames change so the new devname now refers to a filtered device, # e.g. an mpath or md component, which is not scanned

1 0

main - vdo: improve validation message
by Zdenek Kabelac 08 Nov '22

08 Nov '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=403779333be419352d606… Commit: 403779333be419352d6062da592ea78e6096e12b Parent: b9f35e07db41f3dd6bea2c91a8bc1bff93a4d406 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Nov 8 12:40:21 2022 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Nov 8 12:40:21 2022 +0100 vdo: improve validation message Rephrase. --- device_mapper/vdo/vdo_target.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/device_mapper/vdo/vdo_target.c b/device_mapper/vdo/vdo_target.c index ab3fff26a..a8a753e39 100644 --- a/device_mapper/vdo/vdo_target.c +++ b/device_mapper/vdo/vdo_target.c @@ -156,9 +156,9 @@ bool dm_vdo_validate_target_params(const struct dm_vdo_target_params *vtp, } if (vdo_size > DM_VDO_LOGICAL_SIZE_MAXIMUM) { - log_error("VDO logical size is by " FMTu64 "KiB bigger then limit " FMTu64 "TiB.", - (vdo_size - DM_VDO_LOGICAL_SIZE_MAXIMUM) / 2, - DM_VDO_LOGICAL_SIZE_MAXIMUM / (UINT64_C(1024) * 1024 * 1024 * 1024 >> SECTOR_SHIFT)); + log_error("VDO logical size is larger than limit " FMTu64 " TiB by " FMTu64 " KiB.", + DM_VDO_LOGICAL_SIZE_MAXIMUM / (UINT64_C(1024) * 1024 * 1024 * 1024 >> SECTOR_SHIFT), + (vdo_size - DM_VDO_LOGICAL_SIZE_MAXIMUM) / 2); valid = false; }

1 0

main - lvcreate: fix error path return values
by Zdenek Kabelac 08 Nov '22

08 Nov '22

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b9f35e07db41f3dd6bea2… Commit: b9f35e07db41f3dd6bea2c91a8bc1bff93a4d406 Parent: 0fed9b097120648301faa586970a47b8b4d629ff Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Nov 8 12:39:25 2022 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Nov 8 12:39:25 2022 +0100 lvcreate: fix error path return values Return failing error code for return path, as 'return 0' in this case was returning success. --- tools/lvcreate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 670c52913..3c89fd2c1 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -1750,21 +1750,21 @@ static int _lvcreate_single(struct cmd_context *cmd, const char *vg_name, goto_out; if (seg_is_vdo(lp) && !_check_vdo_parameters(vg, lp, lcp)) - return_0; + goto_out; if (!_check_pool_parameters(cmd, vg, lp, lcp)) goto_out; /* All types are checked */ if (!_check_zero_parameters(cmd, lp)) - return_0; + goto_out; if (!_update_extents_params(vg, lp, lcp)) goto_out; if (seg_is_vdo(lp) && !check_vdo_constrains(cmd, (uint64_t)lp->extents * vg->extent_size, lcp->virtual_size, &lp->vdo_params)) - return_0; + goto_out; if (seg_is_thin(lp) && !_validate_internal_thin_processing(lp)) goto_out;

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits November 2022