June 2023 - lvm2-commits - Fedora mailing-lists

main - pool: avoid using artificial name internally
by Zdenek Kabelac 29 Jun '23

29 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e84b00964fd6374c5afcf… Commit: e84b00964fd6374c5afcfd86d3f61a7fda58b29d Parent: 3596558861e62ca0c6f37bfba6a4e80e46dcca47 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 13:53:43 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 13:55:27 2023 +0200 pool: avoid using artificial name internally --- lib/metadata/metadata-exported.h | 2 +- lib/metadata/pool_manip.c | 5 +---- tools/lvconvert.c | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index ded0389b1..9f8c4d876 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -916,7 +916,7 @@ struct lv_status_thin { const char *get_pool_discards_name(thin_discards_t discards); int set_pool_discards(thin_discards_t *discards, const char *str); struct logical_volume *alloc_pool_metadata(struct logical_volume *pool_lv, - const char *name, uint32_t read_ahead, + uint32_t read_ahead, uint32_t stripes, uint32_t stripe_size, uint32_t extents, alloc_policy_t alloc, struct dm_list *pvh); diff --git a/lib/metadata/pool_manip.c b/lib/metadata/pool_manip.c index 559b07ba8..8a908a58d 100644 --- a/lib/metadata/pool_manip.c +++ b/lib/metadata/pool_manip.c @@ -607,7 +607,7 @@ bad: } struct logical_volume *alloc_pool_metadata(struct logical_volume *pool_lv, - const char *name, uint32_t read_ahead, + uint32_t read_ahead, uint32_t stripes, uint32_t stripe_size, uint32_t extents, alloc_policy_t alloc, struct dm_list *pvh) @@ -639,9 +639,6 @@ struct logical_volume *alloc_pool_metadata(struct logical_volume *pool_lv, if (!(metadata_lv = lv_create_single(pool_lv->vg, &lvc))) return_0; - if (!lv_rename_update(pool_lv->vg->cmd, metadata_lv, name, 0)) - return_0; - return metadata_lv; } diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 0e928d39c..84659d3f4 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -3269,7 +3269,6 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, meta_alloc = (alloc_policy_t) arg_uint_value(cmd, alloc_ARG, ALLOC_INHERIT); if (!(metadata_lv = alloc_pool_metadata(lv, - meta_name, meta_readahead, meta_stripes, meta_stripe_size, @@ -3426,7 +3425,7 @@ static int _lvconvert_to_pool(struct cmd_context *cmd, * Rename deactivated metadata LV to have _tmeta suffix. * Implicit checks if metadata_lv is visible. */ - if (pool_metadata_name && + if ((strcmp(metadata_lv->name, meta_name) != 0) && !lv_rename_update(cmd, metadata_lv, meta_name, 0)) goto_bad;

1 0

main - lv: more details about monitoring lvs
by Zdenek Kabelac 29 Jun '23

29 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3596558861e62ca0c6f37… Commit: 3596558861e62ca0c6f37bfba6a4e80e46dcca47 Parent: 8a07f57ba478c16ca5d5eacf778ee2708109aa65 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Jun 28 11:51:35 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 13:10:42 2023 +0200 lv: more details about monitoring lvs Show "not supported" when LV does not support dmeventd monitoring. Show "disabled" for LV with disabled dmeventd monitoring. (lvdisplay -m) --- lib/metadata/lv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index 21aa3b422..1e3fc02d4 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -311,10 +311,11 @@ char *lvseg_monitor_dup(struct dm_pool *mem, const struct lv_segment *seg) segm = first_seg(seg->lv->snapshot->lv); // log_debug("Query LV:%s mon:%s segm:%s tgtm:%p segmon:%d statusm:%d", seg->lv->name, segm->lv->name, segm->segtype->name, segm->segtype->ops->target_monitored, seg_monitored(segm), (int)(segm->status & PVMOVE)); - if ((dmeventd_monitor_mode() != 1) || - !segm->segtype->ops || + if (!segm->segtype->ops || !segm->segtype->ops->target_monitored) - /* Nothing to do, monitoring not supported */; + s = "disabled"; + else if (dmeventd_monitor_mode() != 1) + s = "not enabled"; else if (lv_is_cow_covering_origin(seg->lv)) /* Nothing to do, snapshot already covers origin */; else if (!seg_monitored(segm) || (segm->status & PVMOVE))

1 0

main - lvm_import_vdo: spelling fixes
by Zdenek Kabelac 29 Jun '23

29 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8a07f57ba478c16ca5d5e… Commit: 8a07f57ba478c16ca5d5eacf778ee2708109aa65 Parent: 8b75bbe47d2a2961b0fb029ad7a01dc37ee6a8e5 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 13:05:55 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 13:10:42 2023 +0200 lvm_import_vdo: spelling fixes --- scripts/lvm_import_vdo.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/lvm_import_vdo.sh b/scripts/lvm_import_vdo.sh index 319bcb33d..b5e1a9e16 100755 --- a/scripts/lvm_import_vdo.sh +++ b/scripts/lvm_import_vdo.sh @@ -52,7 +52,7 @@ DM_DEV_DIR="${DM_DEV_DIR:-/dev}" DM_UUID_PREFIX="${DM_UUID_PREFIX:-}" DM_VG_NAME= DM_LV_NAME= -VDO_CONFIG=${VDO_CONFIG:-} # can be overriden with --vdo-config +VDO_CONFIG=${VDO_CONFIG:-} # can be overridden with --vdo-config VDOCONF= test -n "$VDO_CONFIG" && VDOCONF="-f $VDO_CONFIG" @@ -150,7 +150,7 @@ snapshot_create_() { snapshot_merge_() { local status - local inital_status + local initial_status initial_status=( $("$DMSETUP" status "$VDO_DM_SNAPSHOT_NAME") ) "$DMSETUP" reload "$VDO_DM_SNAPSHOT_NAME" --table "$(snapshot_target_line_ "$1" "$VDO_SNAPSHOT_LOOP" -merge)" @@ -165,7 +165,7 @@ snapshot_merge_() { #du -h "$TEMPDIR/$VDO_DM_SNAPSHOT_NAME" # Loop for a while, till the snapshot is merged. - # Should be nearly instantenious. + # Should be nearly instantaneous. # FIXME: Recovery when something prevents merging is hard for i in $(seq 1 20) ; do status=( $("$DMSETUP" status "$VDO_DM_SNAPSHOT_NAME") ) @@ -231,7 +231,7 @@ get_largest_extent_size_() { } # detect LV on the given device -# dereference device name if it is symbolic link +# deference device name if it is symbolic link detect_lv_() { local DEVICE=$1 local SYSVOLUME @@ -315,7 +315,7 @@ parse_yaml_() { # Currently this enforces a user to reduce the VG extent size to the smaller size (up to 4KiB). # # TODO: We may eventually relax this condition just like we are doing rounding for convert_non_lv_() -# Let's if there would be any singly user requiring this feauture. +# Let's if there would be any singly user requiring this feature. # It may allow to better use larger VDO volume size (in TiB ranges). # convert_lv_() { @@ -351,7 +351,7 @@ convert_lv_() { # Convert VDO volume on a device to VG with VDOPool LV # # Convert device with the use of snapshot on top of original VDO volume (can be optionally disabled) -# Once the whole conversion is finished, snapshot is merged (During the short periof time of merging +# Once the whole conversion is finished, snapshot is merged (During the short period time of merging # user must ensure there will be no power-off!) # # For best use the latest version of vdoprepareforlvm tool is required. @@ -373,12 +373,12 @@ convert_non_lv_() { output=$(dry "$VDO" convert $VDOCONF $VERB --force --name "$VDONAME") if [ "$ABORT_AFTER_VDO_CONVERT" != "0" ] ; then - verbose "Aborting VDO coversion after moving VDO, volume is useless!" + verbose "Aborting VDO conversion after moving VDO header, volume is useless!" cleanup 0 fi # Parse result from VDO preparation/conversion tool - # New version of the tool provides output with alingment and offset + # New version of the tool provides output with alignment and offset local vdo_length=0 local vdo_aligned=0 local vdo_offset=0 @@ -432,7 +432,7 @@ convert_non_lv_() { verbose "Converting to VDO pool." dry "$LVM" lvconvert $YES $VERB $FORCE --devices "$devices" --config "$VDO_ALLOCATION_PARAMS" -Zn -V "${vdo_logicalSizeRounded}k" -n "$LVNAME" --type vdo-pool "$VGNAME/${LVNAME}_vpool" if [ "$vdo_logicalSizeRounded" -lt "$vdo_logicalSize" ] ; then - # need to extend virtal size to be covering all the converted area + # need to extend virtual size to be covering all the converted area # let lvm2 to round to the proper virtual size of VDO LV dry "$LVM" lvextend $YES $VERB --fs ignore --devices "$devices" -L "$vdo_logicalSize"k "$VGNAME/$LVNAME" fi @@ -512,7 +512,7 @@ convert2lvm_() { "$MKDIR" -p -m 0000 "$TEMPDIR" || error "Failed to create $TEMPDIR." - # TODO: might use directly /etc/vdoconf.yml (avoding need of 'vdo' manager) + # TODO: might use directly /etc/vdoconf.yml (avoiding need of 'vdo' manager) verbose "Getting YAML VDO configuration." "$VDO" printConfigFile $VDOCONF >"$TEMPDIR/vdoconf.yml" test -s "$TEMPDIR/vdoconf.yml" || error "Cannot work without VDO configuration"

1 0

main - vdo: lvm_import_vdo correct parsing output
by Zdenek Kabelac 29 Jun '23

29 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8b75bbe47d2a2961b0fb0… Commit: 8b75bbe47d2a2961b0fb029ad7a01dc37ee6a8e5 Parent: e48c9826e3069b06a5aa31e1e59200dce4915983 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 29 13:06:18 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 13:10:42 2023 +0200 vdo: lvm_import_vdo correct parsing output Output from vdo manager may actually indent output with spaces, so trim leading and ending space. Also add support for verbosity flag for vdo conversion tool. --- scripts/lvm_import_vdo.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/lvm_import_vdo.sh b/scripts/lvm_import_vdo.sh index 307233429..319bcb33d 100755 --- a/scripts/lvm_import_vdo.sh +++ b/scripts/lvm_import_vdo.sh @@ -370,7 +370,7 @@ convert_non_lv_() { fi verbose "Moving VDO header." - output=$(dry "$VDO" convert $VDOCONF --force --name "$VDONAME") + output=$(dry "$VDO" convert $VDOCONF $VERB --force --name "$VDONAME") if [ "$ABORT_AFTER_VDO_CONVERT" != "0" ] ; then verbose "Aborting VDO coversion after moving VDO, volume is useless!" @@ -384,7 +384,8 @@ convert_non_lv_() { local vdo_offset=0 local vdo_non_converted=0 while IFS= read -r line ; do - case "$line" in + # trim leading spaces + case "$(echo $line)" in "Non converted"*) vdo_non_converted=1 ;; "Length"*) vdo_length=${line##* = } ;; "Conversion completed"*) @@ -579,7 +580,7 @@ EOF verbose "VDO conversion parameters: $VDO_ALLOCATION_PARAMS" verbose "Stopping VDO volume." - dry "$VDO" stop $VDOCONF --name "$VDONAME" + dry "$VDO" stop $VDOCONF --name "$VDONAME" $VERB # If user has not provided '--yes', prompt before conversion if [ -z "$YES" ] && [ "$USE_VDO_DM_SNAPSHOT" != "1" ]; then

1 0

main - vdo: indent for lvdisplay
by Zdenek Kabelac 29 Jun '23

29 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=e48c9826e3069b06a5aa3… Commit: e48c9826e3069b06a5aa31e1e59200dce4915983 Parent: 6ff65e675582265a673136f1edd5358b26c9e481 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Jun 28 11:53:29 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 13:10:42 2023 +0200 vdo: indent for lvdisplay --- lib/vdo/vdo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/vdo/vdo.c b/lib/vdo/vdo.c index 133678ae7..6d3b67421 100644 --- a/lib/vdo/vdo.c +++ b/lib/vdo/vdo.c @@ -173,7 +173,7 @@ static void _vdo_pool_display(const struct lv_segment *seg) display_size(cmd, vtp->minimum_io_size)); log_print(" Block map cache sz\t%s", display_size(cmd, vtp->block_map_cache_size_mb * UINT64_C(2 * 1024))); - log_print(" Block map era length\t%u", vtp->block_map_era_length); + log_print(" Block map era length %u", vtp->block_map_era_length); _print_yes_no("Sparse index", vtp->use_sparse_index); @@ -190,7 +190,7 @@ static void _vdo_pool_display(const struct lv_segment *seg) log_print(" # Hash zone threads\t%u", (unsigned) vtp->hash_zone_threads); log_print(" # Logical threads\t%u", (unsigned) vtp->logical_threads); log_print(" # Physical threads\t%u", (unsigned) vtp->physical_threads); - log_print(" Max discard\t%u", (unsigned) vtp->max_discard); + log_print(" Max discard\t\t%u", (unsigned) vtp->max_discard); log_print(" Write policy\t%s", get_vdo_write_policy_name(vtp->write_policy)); }

1 0

main - vdo: check_point_frequence is unused option
by Zdenek Kabelac 29 Jun '23

29 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=6ff65e675582265a67313… Commit: 6ff65e675582265a673136f1edd5358b26c9e481 Parent: fa434a18373e42108aed319d3257c935f510f2c3 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Jun 28 11:55:20 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Thu Jun 29 13:10:42 2023 +0200 vdo: check_point_frequence is unused option This vdo parameter existed in the early stage of integration of vdo into lvm2, but later it's been removed from vdoformat tool - so actually if there would be any non-zero value it would cause error on lvcreate. Option was not stored on disk in lvm2 metadata. Remove this vdo parameter from lvm2 sources. (Although this vdo parameter will be still accepted on cmdline through --vdosettings option, but it will be ignored.) --- conf/example.conf.in | 5 ----- conf/vdo-small.profile | 1 - device_mapper/vdo/target.h | 1 - lib/config/config_settings.h | 4 ++-- lib/metadata/merge.c | 1 - lib/metadata/vdo_manip.c | 10 ---------- man/lvmvdo.7_main | 1 - scripts/lvm_import_vdo.sh | 1 - tools/toollib.c | 6 +++++- 9 files changed, 7 insertions(+), 23 deletions(-) diff --git a/conf/example.conf.in b/conf/example.conf.in index 35837c013..1ed1f854b 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in @@ -650,11 +650,6 @@ allocation { # This configuration option has an automatic default value. # vdo_block_map_period = 16380 - # Configuration option allocation/vdo_check_point_frequency. - # The default check point frequency for VDO volume. - # This configuration option has an automatic default value. - # vdo_check_point_frequency = 0 - # Configuration option allocation/vdo_use_sparse_index. # Enables sparse indexing for VDO volume. # This configuration option has an automatic default value. diff --git a/conf/vdo-small.profile b/conf/vdo-small.profile index 2044fc27f..97b5b37dd 100644 --- a/conf/vdo-small.profile +++ b/conf/vdo-small.profile @@ -8,7 +8,6 @@ allocation { vdo_minimum_io_size=4096 vdo_block_map_cache_size_mb=128 vdo_block_map_period=16380 - vdo_check_point_frequency=0 vdo_use_sparse_index=0 vdo_index_memory_size_mb=256 vdo_slab_size_mb=2048 diff --git a/device_mapper/vdo/target.h b/device_mapper/vdo/target.h index bd21bb5d7..353320f9e 100644 --- a/device_mapper/vdo/target.h +++ b/device_mapper/vdo/target.h @@ -81,7 +81,6 @@ struct dm_vdo_target_params { uint32_t block_map_era_length; // format period uint32_t block_map_period; // supported alias }; - uint32_t check_point_frequency; uint32_t index_memory_size_mb; // format uint32_t slab_size_mb; // format diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index 51e11857e..fd56993ba 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -732,8 +732,8 @@ cfg(allocation_vdo_block_map_era_length_CFG, "vdo_block_map_period", allocation_ "The maximum and recommended value is " DM_TO_STRING(DM_VDO_BLOCK_MAP_ERA_LENGTH_MAXIMUM) "; the minimum value is " DM_TO_STRING(DM_VDO_BLOCK_MAP_ERA_LENGTH_MINIMUM) ".\n") -cfg(allocation_vdo_check_point_frequency_CFG, "vdo_check_point_frequency", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_VDO_CHECK_POINT_FREQUENCY, VDO_1ST_VSN, NULL, 0, NULL, - "The default check point frequency for VDO volume.\n") +cfg(allocation_vdo_check_point_frequency_CFG, "vdo_check_point_frequency", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_VDO_CHECK_POINT_FREQUENCY, VDO_1ST_VSN, NULL, vsn(2, 3, 22), NULL, + "Deprecated option to set default check point frequency for VDO volume.\n") // vdo format cfg(allocation_vdo_use_sparse_index_CFG, "vdo_use_sparse_index", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_COMMENTED, CFG_TYPE_INT, DEFAULT_VDO_USE_SPARSE_INDEX, VDO_1ST_VSN, NULL, 0, NULL, diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c index 5209f51b5..25b2bc33a 100644 --- a/lib/metadata/merge.c +++ b/lib/metadata/merge.c @@ -555,7 +555,6 @@ static void _check_lv_segment(struct logical_volume *lv, struct lv_segment *seg, if (seg->vdo_params.minimum_io_size | seg->vdo_params.block_map_cache_size_mb | seg->vdo_params.block_map_era_length | - seg->vdo_params.check_point_frequency | seg->vdo_params.index_memory_size_mb | seg->vdo_params.slab_size_mb | seg->vdo_params.max_discard | diff --git a/lib/metadata/vdo_manip.c b/lib/metadata/vdo_manip.c index 19291c9d6..f24182cca 100644 --- a/lib/metadata/vdo_manip.c +++ b/lib/metadata/vdo_manip.c @@ -283,14 +283,6 @@ static int _format_vdo_pool_data_lv(struct logical_volume *data_lv, argv[args] = buf_args[args]; args++; - if (vtp->check_point_frequency) { - if (dm_snprintf(buf_args[args], sizeof(buf_args[0]), "--uds-checkpoint-frequency=%u", - vtp->check_point_frequency) < 0) - return_0; - argv[args] = buf_args[args]; - args++; - } - /* Convert size to GiB units or one of these strings: 0.25, 0.50, 0.75 */ if (vtp->index_memory_size_mb >= 1024) { if (dm_snprintf(buf_args[args], sizeof(buf_args[0]), "--uds-memory-size=%u", @@ -516,8 +508,6 @@ int fill_vdo_target_params(struct cmd_context *cmd, find_config_tree_int64(cmd, allocation_vdo_block_map_cache_size_mb_CFG, profile); vtp->block_map_era_length = find_config_tree_int(cmd, allocation_vdo_block_map_era_length_CFG, profile); - vtp->check_point_frequency = - find_config_tree_int(cmd, allocation_vdo_check_point_frequency_CFG, profile); vtp->use_sparse_index = find_config_tree_int(cmd, allocation_vdo_use_sparse_index_CFG, profile); vtp->index_memory_size_mb = diff --git a/man/lvmvdo.7_main b/man/lvmvdo.7_main index 8c3e3eeaa..a31e5dd4d 100644 --- a/man/lvmvdo.7_main +++ b/man/lvmvdo.7_main @@ -165,7 +165,6 @@ vdo_use_metadata_hints=1 vdo_minimum_io_size=4096 vdo_block_map_cache_size_mb=128 vdo_block_map_period=16380 -vdo_check_point_frequency=0 vdo_use_sparse_index=0 vdo_index_memory_size_mb=256 vdo_slab_size_mb=2048 diff --git a/scripts/lvm_import_vdo.sh b/scripts/lvm_import_vdo.sh index 13197c6fb..307233429 100755 --- a/scripts/lvm_import_vdo.sh +++ b/scripts/lvm_import_vdo.sh @@ -560,7 +560,6 @@ allocation { vdo_minimum_io_size = $vdo_logicalBlockSize vdo_block_map_cache_size_mb = $(( $(get_kb_size_with_unit_ "$vdo_blockMapCacheSize") / 1024 )) vdo_block_map_period = $vdo_blockMapPeriod - vdo_check_point_frequency = $vdo_indexCfreq vdo_use_sparse_index = $(get_enabled_value_ "$vdo_indexSparse") vdo_index_memory_size_mb = $(awk "BEGIN {print $vdo_indexMemory * 1024}") vdo_slab_size_mb = $(( $(get_kb_size_with_unit_ "$vdo_slabSize") / 1024 )) diff --git a/tools/toollib.c b/tools/toollib.c index 2f4756b6b..696f541c4 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -1319,7 +1319,6 @@ int get_vdo_settings(struct cmd_context *cmd, // Settings bellow cannot be changed with lvchange command is_lvchange = checked_lvchange; - DO_OFFLINE(check_point_frequency); DO_OFFLINE(index_memory_size_mb); DO_OFFLINE(minimum_io_size); DO_OFFLINE(slab_size_mb); @@ -1336,6 +1335,11 @@ int get_vdo_settings(struct cmd_context *cmd, continue; } + if (_compare_vdo_option(cn->key, "check_point_frequency")) { + log_verbose("Ignoring deprecated --vdosettings option \"%s\" and its value.", cn->key); + continue; /* Accept & ignore deprecated option */ + } + log_error("Unknown VDO setting \"%s\".", cn->key); goto out; }

1 0

main - tests: simplify
by Zdenek Kabelac 25 Jun '23

25 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=fa434a18373e42108aed3… Commit: fa434a18373e42108aed319d3257c935f510f2c3 Parent: b8db2c0a4a4bbfc39338141cd7eee67c05b2b31d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sun Jun 25 12:58:27 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Sun Jun 25 13:02:36 2023 +0200 tests: simplify --- test/shell/vgsplit-cache.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/shell/vgsplit-cache.sh b/test/shell/vgsplit-cache.sh index 202e4b562..65a711f75 100644 --- a/test/shell/vgsplit-cache.sh +++ b/test/shell/vgsplit-cache.sh @@ -20,6 +20,7 @@ SKIP_WITH_LVMPOLLD=1 aux have_cache 1 3 0 || skip aux prepare_vg 7 +vgcfgbackup -f vgb $vg lvcreate -L5 -n $lv2 $vg "$dev2" lvcreate -L5 -n $lv3 $vg "$dev3" @@ -78,7 +79,7 @@ vgremove -ff $vg1 # # Check we handle pmspare for splitted VGs # -aux prepare_vg 7 +vgcfgrestore -f vgb $vg # Create cache-pool and pmspare on single PV1 lvcreate -L10 --type cache-pool $vg/cpool "$dev1" @@ -100,7 +101,7 @@ vgremove $vg vgremove -f $vg1 -aux prepare_vg 7 +vgcfgrestore -f vgb $vg # Again - now with handling _pmspare by vgsplit lvcreate -L10 --type cache-pool $vg/cpool "$dev1"

1 0

main - tests: require raid target
by Zdenek Kabelac 25 Jun '23

25 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=b8db2c0a4a4bbfc393381… Commit: b8db2c0a4a4bbfc39338141cd7eee67c05b2b31d Parent: 04860b63240c19065f79453bdffbb7637f2f01eb Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Jun 24 22:37:12 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Sun Jun 25 13:02:36 2023 +0200 tests: require raid target --- test/shell/snapshot-raid.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test/shell/snapshot-raid.sh b/test/shell/snapshot-raid.sh index 7b045d79e..98314ddb0 100644 --- a/test/shell/snapshot-raid.sh +++ b/test/shell/snapshot-raid.sh @@ -16,6 +16,7 @@ SKIP_WITH_LVMPOLLD=1 . lib/inittest +aux have_raid 1 3 0 || skip which mkfs.ext4 || skip mount_dir="mnt"

1 0

main - tests: correct checked devices
by Zdenek Kabelac 25 Jun '23

25 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=04860b63240c19065f794… Commit: 04860b63240c19065f79453bdffbb7637f2f01eb Parent: 5848f75278250835dd718fbcacc167133af66b35 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sun Jun 25 11:52:47 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Sun Jun 25 13:02:36 2023 +0200 tests: correct checked devices Fix the testing logic. With raid5 device the layout of files on a filesystem does not define which leg will actually contain the block we try to damage. So test will now figure out which device has damaged block. Use 'check' functionality and also drop unneeded random write as we now can identify easily in other way. --- test/shell/integrity-syncaction.sh | 59 ++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/test/shell/integrity-syncaction.sh b/test/shell/integrity-syncaction.sh index 0f8ce17d2..2714aede1 100644 --- a/test/shell/integrity-syncaction.sh +++ b/test/shell/integrity-syncaction.sh @@ -43,12 +43,6 @@ _test1() { mount "$DM_DEV_DIR/$vg/$lv1" $mnt - # we don't want fileA to be located too early in the fs, - # otherwise activating the LV will trigger the corruption - # to be found and corrected, leaving nothing for syncaction - # to find and correct. - dd if=/dev/urandom of=$mnt/rand16M bs=1M count=16 - cp fileA $mnt cp fileB $mnt cp fileC $mnt @@ -56,19 +50,30 @@ _test1() { umount $mnt lvchange -an $vg/$lv1 - aux corrupt_dev "$dev1" BBBBBBBBBBBBBBBBB BBBBBBBBCBBBBBBBB + # Corrupting raid1 is simple - 1 leg needs to be modifed + # For raid5 corrupted block can be places on any of its leg. + for i in "$@" ; do + aux corrupt_dev "$i" BBBBBBBBBBBBBBBBB BBBBBBBBCBBBBBBBB + done lvchange -ay $vg/$lv1 - lvs -o integritymismatches $vg/${lv1}_rimage_0 |tee mismatch - grep 0 mismatch + # so without synchecking the array - integrity doesn't know yet about failure + check lv_field $vg/${lv1}_rimage_0 integritymismatches "0" + check lv_field $vg/${lv1}_rimage_1 integritymismatches "0" + [ $# -gt 2 ] && check lv_field $vg/${lv1}_rimage_2 integritymismatches "0" lvchange --syncaction check $vg/$lv1 aux wait_recalc $vg/$lv1 - lvs -o integritymismatches $vg/${lv1}_rimage_0 |tee mismatch - not grep 0 mismatch + # after synaction check - integrity should recognize faulty devices + baddev=0 + for i in 0 1 2 ; do + [ "$i" -gt 1 ] && [ $# -lt 3 ] && continue # only raid5 has rimage_2 + [ "$(get lv_field $vg/${lv1}_rimage_${i} integritymismatches)" = "0" ] || baddev=$(( baddev + 1 )) + done + [ "$baddev" -eq 1 ] || die "Unexpected number of integritymismatched devices ($baddev)!" mount "$DM_DEV_DIR/$vg/$lv1" $mnt cmp -b $mnt/fileA fileA @@ -82,12 +87,6 @@ _test2() { mount "$DM_DEV_DIR/$vg/$lv1" $mnt - # we don't want fileA to be located too early in the fs, - # otherwise activating the LV will trigger the corruption - # to be found and corrected, leaving nothing for syncaction - # to find and correct. - dd if=/dev/urandom of=$mnt/rand16M bs=1M count=16 - cp fileA $mnt cp fileB $mnt cp fileC $mnt @@ -104,19 +103,15 @@ _test2() { lvchange -ay $vg/$lv1 - lvs -o integritymismatches $vg/${lv1}_rimage_0 |tee mismatch - grep 0 mismatch - lvs -o integritymismatches $vg/${lv1}_rimage_1 |tee mismatch - grep 0 mismatch + check lv_field $vg/${lv1}_rimage_0 integritymismatches "0" + check lv_field $vg/${lv1}_rimage_1 integritymismatches "0" lvchange --syncaction check $vg/$lv1 aux wait_recalc $vg/$lv1 - lvs -o integritymismatches $vg/${lv1}_rimage_0 |tee mismatch - not grep 0 mismatch - lvs -o integritymismatches $vg/${lv1}_rimage_1 |tee mismatch - not grep 0 mismatch + not check lv_field $vg/${lv1}_rimage_0 integritymismatches "0" + not check lv_field $vg/${lv1}_rimage_1 integritymismatches "0" mount "$DM_DEV_DIR/$vg/$lv1" $mnt cmp -b $mnt/fileA fileA @@ -130,9 +125,8 @@ lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -l 6 $vg "$dev1" "$dev2" aux wait_recalc $vg/${lv1}_rimage_0 aux wait_recalc $vg/${lv1}_rimage_1 aux wait_recalc $vg/$lv1 -_test1 -lvs -o integritymismatches $vg/$lv1 |tee mismatch -not grep 0 mismatch +_test1 "$dev1" +not check $vg/$lv1 integritymismatches "0" lvchange -an $vg/$lv1 lvconvert --raidintegrity n $vg/$lv1 lvremove $vg/$lv1 @@ -144,8 +138,7 @@ aux wait_recalc $vg/${lv1}_rimage_0 aux wait_recalc $vg/${lv1}_rimage_1 aux wait_recalc $vg/$lv1 _test2 -lvs -o integritymismatches $vg/$lv1 |tee mismatch -not grep 0 mismatch +not check $vg/$lv1 integritymismatches "0" lvchange -an $vg/$lv1 lvconvert --raidintegrity n $vg/$lv1 lvremove $vg/$lv1 @@ -157,11 +150,9 @@ aux wait_recalc $vg/${lv1}_rimage_0 aux wait_recalc $vg/${lv1}_rimage_1 aux wait_recalc $vg/${lv1}_rimage_2 aux wait_recalc $vg/$lv1 -_test1 -lvs -o integritymismatches $vg/$lv1 |tee mismatch -not grep 0 mismatch +_test1 "$dev1" "$dev2" "$dev3" +not check $vg/$lv1 integritymismatches "0" lvchange -an $vg/$lv1 lvconvert --raidintegrity n $vg/$lv1 lvremove $vg/$lv1 vgremove -ff $vg -

1 0

main - tests: correct generated metadata
by Zdenek Kabelac 25 Jun '23

25 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=5848f75278250835dd718… Commit: 5848f75278250835dd718fbcacc167133af66b35 Parent: 0a5712ada4753cd034d862389e6e91af387c406f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Jun 24 22:34:38 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Sun Jun 25 12:00:57 2023 +0200 tests: correct generated metadata Newer thin_check actually rejects such restored data. --- test/shell/lvextend-thin-metadata-dmeventd.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/shell/lvextend-thin-metadata-dmeventd.sh b/test/shell/lvextend-thin-metadata-dmeventd.sh index 3193cc29c..732f67023 100644 --- a/test/shell/lvextend-thin-metadata-dmeventd.sh +++ b/test/shell/lvextend-thin-metadata-dmeventd.sh @@ -48,7 +48,7 @@ fake_metadata_() { for i in $(seq 10 $1) do echo ' <device dev_id="'$i'" mapped_blocks="30" transaction="0" creation_time="0" snap_time="0">' - echo ' <range_mapping origin_begin="0" data_begin="0" length="29" time="0"/>' + echo ' <range_mapping origin_begin="0" data_begin="0" length="30" time="0"/>' echo ' </device>' set +x done @@ -98,6 +98,10 @@ DATA=7200 # Newer version of thin-pool have hidden reserve, so use lower value test -z "$BIG_DATA" || DATA=7400 fake_metadata_ "$DATA" 2 >data "$LVM_TEST_THIN_RESTORE_CMD" -i data -o "$DM_DEV_DIR/mapper/$vg-$lv2" + +# Check tha restored metadata are OK for thin_check +"$LVM_TEST_THIN_CHECK_CMD" "$DM_DEV_DIR/mapper/$vg-$lv2" + # Swap volume with restored fake metadata lvconvert -y --chunksize 64k --thinpool $vg/pool --poolmetadata $vg/$lv2 lvchange -ay $vg/pool

1 0

main - WHATS_NEW: update
by Zdenek Kabelac 23 Jun '23

23 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0a5712ada4753cd034d86… Commit: 0a5712ada4753cd034d862389e6e91af387c406f Parent: 9756824f6447fb8c6096760e802d4f616929f710 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 23 18:07:31 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 23 18:08:10 2023 +0200 WHATS_NEW: update --- WHATS_NEW | 1 + 1 file changed, 1 insertion(+) diff --git a/WHATS_NEW b/WHATS_NEW index cb38ba72e..de40d239d 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ version 2.03.22 - ================================= + Add lvm.conf thin_restore and cache_restore settings. Enhance lvm_import_vdo and use snapshot when converting VDO volume. Fix parsed of VDO metadata. Fix failing -S|--select for non-reporting cmds if using LV info/status fields.

1 0

main - make: generate
by Zdenek Kabelac 23 Jun '23

23 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=9756824f6447fb8c60967… Commit: 9756824f6447fb8c6096760e802d4f616929f710 Parent: 46fe47b8e0ad8069bb3736d2aa3e78befdccb38d Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 23 11:39:46 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 23 18:08:10 2023 +0200 make: generate --- conf/example.conf.in | 28 +++++++++++++++++++++++++++- man/lvcreate.8_pregen | 6 ++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/conf/example.conf.in b/conf/example.conf.in index 0b9b06a17..35837c013 100644 --- a/conf/example.conf.in +++ b/conf/example.conf.in @@ -1201,7 +1201,7 @@ global { # Configuration option global/thin_check_executable. # The full path to the thin_check command. - # LVM uses this command to check that a thin metadata device is in a + # LVM uses this command to check that a thin pool metadata device is in a # usable state. When a thin pool is activated and after it is # deactivated, this command is run. Activation will only proceed if # the command has an exit status of 0. Set to "" to skip this check. @@ -1225,6 +1225,14 @@ global { # This configuration option has an automatic default value. # thin_repair_executable = "@THIN_REPAIR_CMD@" + # Configuration option global/thin_restore_executable. + # The full path to the thin_restore command. + # LVM uses this command to restore generated data for a thin pool metadata device. + # Also see thin_restore_options. + # (See package device-mapper-persistent-data or thin-provisioning-tools) + # This configuration option has an automatic default value. + # thin_restore_executable = "@THIN_RESTORE_CMD@" + # Configuration option global/thin_check_options. # List of options passed to the thin_check command. # With thin_check version 2.1 or newer you can add the option @@ -1239,6 +1247,11 @@ global { # This configuration option has an automatic default value. # thin_repair_options = [ "" ] + # Configuration option global/thin_restore_options. + # List of options passed to the thin_restore command. + # This configuration option has an automatic default value. + # thin_restore_options = [ "" ] + # Configuration option global/thin_disabled_features. # Features to not use in the thin driver. # This can be helpful for testing, or to avoid using a feature that is @@ -1287,6 +1300,14 @@ global { # This configuration option has an automatic default value. # cache_repair_executable = "@CACHE_REPAIR_CMD@" + # Configuration option global/cache_restore_executable. + # The full path to the cache_restore command. + # LVM uses this command to restore generated data for a cache metadata device. + # Also see cache_restore_options. + # (See package device-mapper-persistent-data or thin-provisioning-tools) + # This configuration option has an automatic default value. + # cache_restore_executable = "@CACHE_RESTORE_CMD@" + # Configuration option global/cache_check_options. # List of options passed to the cache_check command. # With cache_check version 5.0 or newer you should include the option @@ -1299,6 +1320,11 @@ global { # This configuration option has an automatic default value. # cache_repair_options = [ "" ] + # Configuration option global/cache_restore_options. + # List of options passed to the cache_restore command. + # This configuration option has an automatic default value. + # cache_restore_options = [ "" ] + # Configuration option global/vdo_format_executable. # The full path to the vdoformat command. # LVM uses this command to initial data volume for VDO type logical volume diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen index 528a9db9c..27a93d890 100644 --- a/man/lvcreate.8_pregen +++ b/man/lvcreate.8_pregen @@ -491,6 +491,8 @@ Create a thin LV that is a snapshot of an existing thin LV. [ \fB--type thin\fP ] (implied) .br .br +[ \fB-T\fP|\fB--thin\fP ] +.br [ COMMON_OPTIONS ] .ad b .RE @@ -1917,6 +1919,8 @@ Create a thin LV that is a snapshot of an existing thin LV. .ad l [ \fB-T\fP|\fB--thin\fP ] .br +[ \fB-s\fP|\fB--snapshot\fP ] +.br [ COMMON_OPTIONS ] .ad b .RE @@ -1937,6 +1941,8 @@ Create a thin LV that is a snapshot of an existing thin LV. [ \fB--type thin\fP ] (implied) .br .br +[ \fB-s\fP|\fB--snapshot\fP ] +.br [ COMMON_OPTIONS ] .ad b .RE

1 0

main - debug: add backtraces
by Zdenek Kabelac 23 Jun '23

23 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=46fe47b8e0ad8069bb373… Commit: 46fe47b8e0ad8069bb3736d2aa3e78befdccb38d Parent: a1d5fba666ccc6f3189d492ba01896f79cf6176f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 23 16:04:55 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 23 18:08:03 2023 +0200 debug: add backtraces --- lib/config/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/config/config.c b/lib/config/config.c index 5531e431d..1c074abe8 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -741,13 +741,13 @@ static struct dm_config_value *_get_def_array_values(struct cmd_context *cmd, } /* Proper value always starts with '#'. */ if (token[0] != '#') - goto bad; + goto_bad; while (token) { /* Move to type identifier. Error on no char. */ token++; if (!token[0]) - goto bad; + goto_bad; /* Move to the actual value and decode any "##" into "#". */ p = token + 1;

1 0

main - aux: add configuration for thin_restore and check_restore
by Zdenek Kabelac 23 Jun '23

23 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=a1d5fba666ccc6f3189d4… Commit: a1d5fba666ccc6f3189d492ba01896f79cf6176f Parent: aed91e49aec64f8375583c7e0febd7b689e69e29 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 23 14:43:36 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 23 18:06:22 2023 +0200 aux: add configuration for thin_restore and check_restore --- test/lib/aux.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 966707f23..6e4a1d74e 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -1552,6 +1552,7 @@ global/abort_on_internal_errors = 1 global/cache_check_executable = "$LVM_TEST_CACHE_CHECK_CMD" global/cache_dump_executable = "$LVM_TEST_CACHE_DUMP_CMD" global/cache_repair_executable = "$LVM_TEST_CACHE_REPAIR_CMD" +global/cache_restore_executable = "$LVM_TEST_CACHE_RESTORE_CMD" global/detect_internal_vg_cache_corruption = 1 global/fallback_to_local_locking = 0 global/etc = "$LVM_SYSTEM_DIR" @@ -1561,6 +1562,7 @@ global/si_unit_consistency = 1 global/thin_check_executable = "$LVM_TEST_THIN_CHECK_CMD" global/thin_dump_executable = "$LVM_TEST_THIN_DUMP_CMD" global/thin_repair_executable = "$LVM_TEST_THIN_REPAIR_CMD" +global/thin_restore_executable = "$LVM_TEST_THIN_RESTORE_CMD" global/use_lvmpolld = $LVM_TEST_LVMPOLLD global/use_lvmlockd = $LVM_TEST_LVMLOCKD log/activation = 1

1 0

main - tests: improve test for machine_id
by Zdenek Kabelac 23 Jun '23

23 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=aed91e49aec64f8375583… Commit: aed91e49aec64f8375583c7e0febd7b689e69e29 Parent: 39d6a9601fd3d85ac4237a4731297cddfd5ecb1f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 23 14:43:07 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 23 18:06:22 2023 +0200 tests: improve test for machine_id --- test/shell/system_id.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/test/shell/system_id.sh b/test/shell/system_id.sh index 14d2c6fd4..486fba1c3 100644 --- a/test/shell/system_id.sh +++ b/test/shell/system_id.sh @@ -24,10 +24,13 @@ print_lvmlocal() { aux prepare_devs 5 -SIDFILE="etc/lvm_test.conf" -LVMLOCAL="etc/lvmlocal.conf" +# get lvm.conf location in a form of: etc=path +eval "$(lvmconfig global/etc)" -DFDIR="$LVM_SYSTEM_DIR/devices" +SIDFILE="$etc/lvm_test.conf" +LVMLOCAL="$etc/lvmlocal.conf" + +DFDIR="$etc/devices" DF="$DFDIR/system.devices" # Avoid system id validation in the devices file @@ -50,10 +53,6 @@ vgcreate $vg1 "$dev1" check vg_field $vg1 systemid "$SID" vgremove $vg1 -# FIXME - print 'life' config data -#eval "$(lvmconfig global/etc 2>/dev/null || lvmconfig --type default global/etc)" -etc="/etc" - ## machineid if [ -e "$etc/machine-id" ]; then SID=$(cat "$etc/machine-id") @@ -708,4 +707,3 @@ vgs -o+systemid $vg1 check vg_field $vg1 systemid "$SID" grep "No system ID found from system_id_source" err vgremove $vg1 -

1 0

main - tests: ensure test defines its own etc dir
by Zdenek Kabelac 23 Jun '23

23 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=39d6a9601fd3d85ac4237… Commit: 39d6a9601fd3d85ac4237a4731297cddfd5ecb1f Parent: 2cb43449ee4c92ae443bd72138fa91bb132aabf7 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 20 21:56:28 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 23 18:06:22 2023 +0200 tests: ensure test defines its own etc dir Compilation may configure it's own /etc path so ensure the test has a defined location for access to this dir during testing. Also prepare machine_id filei (with the use of uuidgen tool) for the test. --- test/lib/aux.sh | 3 ++- test/lib/inittest.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 5a3f0fe44..966707f23 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -1538,7 +1538,7 @@ allocation/vdo_slab_size_mb = 128 allocation/zero_metadata = 0 backup/archive = 0 backup/backup = 0 -devices/cache_dir = "$TESTDIR/etc" +devices/cache_dir = "$LVM_SYSTEM_DIR" devices/default_data_alignment = 1 devices/dir = "$DM_DEV_DIR" devices/md_component_detection = 0 @@ -1554,6 +1554,7 @@ global/cache_dump_executable = "$LVM_TEST_CACHE_DUMP_CMD" global/cache_repair_executable = "$LVM_TEST_CACHE_REPAIR_CMD" global/detect_internal_vg_cache_corruption = 1 global/fallback_to_local_locking = 0 +global/etc = "$LVM_SYSTEM_DIR" global/locking_type=$LVM_TEST_LOCKING global/notify_dbus = 0 global/si_unit_consistency = 1 diff --git a/test/lib/inittest.sh b/test/lib/inittest.sh index c41f4c5b4..0becf2215 100644 --- a/test/lib/inittest.sh +++ b/test/lib/inittest.sh @@ -124,8 +124,9 @@ DM_ABORT_ON_INTERNAL_ERRORS=${DM_ABORT_ON_INTERNAL_ERRORS:-1} DM_DEBUG_WITH_LINE_NUMBERS=${DM_DEBUG_WITH_LINE_NUMBERS:-1} export DM_DEFAULT_NAME_MANGLING_MODE DM_DEV_DIR LVM_SYSTEM_DIR DM_ABORT_ON_INTERNAL_ERRORS - mkdir "$LVM_SYSTEM_DIR" "$DM_DEV_DIR" +MACHINEID=$(uuidgen 2>/dev/null || echo "abcdefabcdefabcdefabcdefabcdefab") +echo "${MACHINEID//-/}" > "$LVM_SYSTEM_DIR/machine-id" # remove all '-' if test -n "$LVM_TEST_DEVDIR" ; then test -d "$LVM_TEST_DEVDIR" || die "Test device directory LVM_TEST_DEVDIR=\"$LVM_TEST_DEVDIR\" is not valid." DM_DEV_DIR=$LVM_TEST_DEVDIR

1 0

main - tests: fix path to dev dir
by Zdenek Kabelac 23 Jun '23

23 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=2cb43449ee4c92ae443bd… Commit: 2cb43449ee4c92ae443bd72138fa91bb132aabf7 Parent: fec3087eefc752036a40d854c373132d25ffd30f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jun 20 21:19:43 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 23 18:06:22 2023 +0200 tests: fix path to dev dir Correct some explicit references to /dev and use $DM_DEV_DIR. --- test/shell/integrity-blocksize.sh | 30 +++++++++++----------- test/shell/lvconvert-raid-reshape-load.sh | 4 +-- .../lvconvert-raid-reshape-stripes-load-fail.sh | 6 ++--- test/shell/lvconvert-raid-reshape-stripes-load.sh | 4 +-- test/shell/vgchange-pvs-online.sh | 8 +++--- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/test/shell/integrity-blocksize.sh b/test/shell/integrity-blocksize.sh index 9fd77086f..e5d2620a1 100644 --- a/test/shell/integrity-blocksize.sh +++ b/test/shell/integrity-blocksize.sh @@ -112,7 +112,7 @@ lvremove -y $vg1/$lv1 # lvconvert on dev512, fsunknown, result 512 lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1 # clear any residual fs so that libblkid cannot find an fs block size -aux wipefs_a /dev/$vg1/$lv1 +aux wipefs_a "$DM_DEV_DIR/$vg1/$lv1" lvconvert --raidintegrity y $vg1/$lv1 pvck --dump metadata "$LOOP1" | grep 'block_size = 512' lvremove -y $vg1/$lv1 @@ -120,7 +120,7 @@ lvremove -y $vg1/$lv1 # lvconvert on dev4k, fsunknown, result 4k lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg2 # clear any residual fs so that libblkid cannot find an fs block size -aux wipefs_a /dev/$vg2/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg2/$lv1" lvconvert --raidintegrity y $vg2/$lv1 pvck --dump metadata $LOOP3 | grep 'block_size = 4096' lvremove -y $vg2/$lv1 @@ -128,20 +128,20 @@ lvremove -y $vg2/$lv1 # lvconvert --bs 4k on dev512, fsunknown, result fail lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1 # clear any residual fs so that libblkid cannot find an fs block size -aux wipefs_a /dev/$vg1/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg1/$lv1" not lvconvert --raidintegrity y --raidintegrityblocksize 4096 $vg1/$lv1 lvremove -y $vg1/$lv1 # lvconvert --bs 512 on dev4k, fsunknown, result fail lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg2 # clear any residual fs so that libblkid cannot find an fs block size -aux wipefs_a /dev/$vg2/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg2/$lv1" not lvconvert --raidintegrity y --raidintegrityblocksize 512 $vg2/$lv1 lvremove -y $vg2/$lv1 # lvconvert on dev512, ext4 1024, result 1024 lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1 -aux wipefs_a /dev/$vg1/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg1/$lv1" mkfs.ext4 "$DM_DEV_DIR/$vg1/$lv1" blkid -p "$DM_DEV_DIR/$vg1/$lv1" | tee out grep BLOCK_SIZE=\"1024\" out @@ -154,7 +154,7 @@ lvremove -y $vg1/$lv1 # lvconvert on dev4k, ext4 4096, result 4096 lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg2 -aux wipefs_a /dev/$vg2/$lv1 +aux wipefs_a "$DM_DEV_DIR/$vg2/$lv1" mkfs.ext4 "$DM_DEV_DIR/$vg2/$lv1" blkid -p "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\" lvconvert --raidintegrity y $vg2/$lv1 @@ -166,7 +166,7 @@ lvremove -y $vg2/$lv1 # lvconvert on dev512, ext4 1024, result 1024 (LV active when adding) lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1 -aux wipefs_a /dev/$vg1/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg1/$lv1" mkfs.ext4 -b 1024 "$DM_DEV_DIR/$vg1/$lv1" blkid -p "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\" lvconvert --raidintegrity y $vg1/$lv1 @@ -178,7 +178,7 @@ lvremove -y $vg1/$lv1 # lvconvert on dev512, ext4 1024, result 1024 (LV inactive when adding) lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1 -aux wipefs_a /dev/$vg1/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg1/$lv1" mkfs.ext4 -b 1024 "$DM_DEV_DIR/$vg1/$lv1" blkid -p "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\" lvchange -an $vg1/$lv1 @@ -192,7 +192,7 @@ lvremove -y $vg1/$lv1 # lvconvert on dev4k, ext4 4096, result 4096 lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg2 -aux wipefs_a /dev/$vg2/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg2/$lv1" mkfs.ext4 "$DM_DEV_DIR/$vg2/$lv1" blkid -p "$DM_DEV_DIR/$vg2/$lv1" | grep BLOCK_SIZE=\"4096\" lvconvert --raidintegrity y $vg2/$lv1 @@ -204,7 +204,7 @@ lvremove -y $vg2/$lv1 # lvconvert --bs 512 on dev512, ext4 4096, result 512 lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1 -aux wipefs_a /dev/$vg1/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg1/$lv1" mkfs.ext4 -b 4096 "$DM_DEV_DIR/$vg1/$lv1" blkid -p "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"4096\" lvconvert --raidintegrity y --raidintegrityblocksize 512 $vg1/$lv1 @@ -217,7 +217,7 @@ lvremove -y $vg1/$lv1 # lvconvert --bs 1024 on dev512, ext4 4096, result 1024 lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1 -aux wipefs_a /dev/$vg1/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg1/$lv1" mkfs.ext4 -b 4096 "$DM_DEV_DIR/$vg1/$lv1" blkid -p "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"4096\" lvchange -an $vg1/$lv1 @@ -233,7 +233,7 @@ lvremove -y $vg1/$lv1 # lvconvert --bs 512 on dev512, ext4 1024, result 512 lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1 -aux wipefs_a /dev/$vg1/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg1/$lv1" mkfs.ext4 -b 1024 "$DM_DEV_DIR/$vg1/$lv1" blkid -p "$DM_DEV_DIR/$vg1/$lv1" | grep BLOCK_SIZE=\"1024\" lvconvert --raidintegrity y --raidintegrityblocksize 512 $vg1/$lv1 @@ -245,7 +245,7 @@ lvremove -y $vg1/$lv1 # lvconvert --bs 512 on dev4k, ext4 4096, result fail lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg2 -aux wipefs_a /dev/$vg2/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg2/$lv1" mkfs.ext4 "$DM_DEV_DIR/$vg2/$lv1" not lvconvert --raidintegrity y --raidintegrityblocksize 512 $vg2/$lv1 lvremove -y $vg2/$lv1 @@ -257,7 +257,7 @@ lvremove -y $vg2/$lv1 # lvconvert on dev512, ext4 1024, result 1024, (detect fs with LV inactive) lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg1 -aux wipefs_a /dev/$vg1/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg1/$lv1" mkfs.ext4 "$DM_DEV_DIR/$vg1/$lv1" mount "$DM_DEV_DIR/$vg1/$lv1" $mnt echo "test" > $mnt/test @@ -277,7 +277,7 @@ lvremove -y $vg1/$lv1 # lvconvert on dev4k, ext4 4096, result 4096 (detect fs with LV inactive) lvcreate --type raid1 -m1 -l 8 -n $lv1 $vg2 -aux wipefs_a /dev/$vg2/$lv1 +aux wipefs_a "$DM_DEV_DIR//$vg2/$lv1" mkfs.ext4 "$DM_DEV_DIR/$vg2/$lv1" mount "$DM_DEV_DIR/$vg2/$lv1" $mnt echo "test" > $mnt/test diff --git a/test/shell/lvconvert-raid-reshape-load.sh b/test/shell/lvconvert-raid-reshape-load.sh index 29b8e4ca4..5b381ac09 100644 --- a/test/shell/lvconvert-raid-reshape-load.sh +++ b/test/shell/lvconvert-raid-reshape-load.sh @@ -45,8 +45,8 @@ lvcreate --yes --type raid5_ls --stripes 13 -L4 -n$lv1 $vg check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" check lv_first_seg_field $vg/$lv1 data_stripes 13 check lv_first_seg_field $vg/$lv1 stripes 14 -wipefs -a /dev/$vg/$lv1 -mkfs -t ext4 /dev/$vg/$lv1 +wipefs -a "$DM_DEV_DIR/$vg/$lv1" +mkfs -t ext4 "$DM_DEV_DIR/$vg/$lv1" aux wait_for_sync $vg $lv1 mkdir -p $mount_dir diff --git a/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh b/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh index da9d34798..b35cd8db6 100644 --- a/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh +++ b/test/shell/lvconvert-raid-reshape-stripes-load-fail.sh @@ -46,9 +46,9 @@ check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" check lv_first_seg_field $vg/$lv1 stripesize "64.00k" check lv_first_seg_field $vg/$lv1 data_stripes 10 check lv_first_seg_field $vg/$lv1 stripes 11 -wipefs -a /dev/$vg/$lv1 -mkfs -t ext4 /dev/$vg/$lv1 -fsck -fn /dev/$vg/$lv1 +wipefs -a "$DM_DEV_DIR/$vg/$lv1" +mkfs -t ext4 "$DM_DEV_DIR/$vg/$lv1" +fsck -fn "$DM_DEV_DIR/$vg/$lv1" mkdir -p "$mount_dir" mount "$DM_DEV_DIR/$vg/$lv1" "$mount_dir" diff --git a/test/shell/lvconvert-raid-reshape-stripes-load.sh b/test/shell/lvconvert-raid-reshape-stripes-load.sh index 68ab8b92b..af1553418 100644 --- a/test/shell/lvconvert-raid-reshape-stripes-load.sh +++ b/test/shell/lvconvert-raid-reshape-stripes-load.sh @@ -46,8 +46,8 @@ check lv_first_seg_field $vg/$lv1 segtype "raid5_ls" check lv_first_seg_field $vg/$lv1 stripesize "64.00k" check lv_first_seg_field $vg/$lv1 data_stripes 10 check lv_first_seg_field $vg/$lv1 stripes 11 -wipefs -a /dev/$vg/$lv1 -mkfs -t ext4 /dev/$vg/$lv1 +wipefs -a "$DM_DEV_DIR/$vg/$lv1" +mkfs -t ext4 "$DM_DEV_DIR//$vg/$lv1" mkdir -p $mount_dir mount "$DM_DEV_DIR/$vg/$lv1" $mount_dir diff --git a/test/shell/vgchange-pvs-online.sh b/test/shell/vgchange-pvs-online.sh index dab7f5ad7..165e96dde 100644 --- a/test/shell/vgchange-pvs-online.sh +++ b/test/shell/vgchange-pvs-online.sh @@ -30,10 +30,10 @@ DF="$DFDIR/system.devices" # Because mapping devno to devname gets dm name from sysfs aux lvmconf 'devices/scan = "/dev"' -bd1="/dev/mapper/$(basename $dev1)" -bd2="/dev/mapper/$(basename $dev2)" -bd3="/dev/mapper/$(basename $dev3)" -bd4="/dev/mapper/$(basename $dev4)" +bd1="$DM_DEV_DIR/mapper/$(basename $dev1)" +bd2="$DM_DEV_DIR/mapper/$(basename $dev2)" +bd3="$DM_DEV_DIR/mapper/$(basename $dev3)" +bd4="$DM_DEV_DIR/mapper/$(basename $dev4)" aux extend_filter "a|$bd1|" "a|$bd2|" "a|$bd3|" "a|$bd4|" # Changing names will confuse df based on devname

1 0

main - thin: add cfg support for thin_restore and cache_restore
by Zdenek Kabelac 23 Jun '23

23 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=fec3087eefc752036a40d… Commit: fec3087eefc752036a40d854c373132d25ffd30f Parent: 8d09124c6204d49f6bda833229c96e8a76665127 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 23 14:39:44 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 23 18:06:22 2023 +0200 thin: add cfg support for thin_restore and cache_restore Add configurable paths for thin_restore and cache_restore. --- lib/config/config_settings.h | 20 +++++++++++++++++++- lib/config/defaults.h | 4 ++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index 2d6d957af..51e11857e 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -1177,7 +1177,7 @@ cfg(global_lvmlockctl_kill_command_CFG, "lvmlockctl_kill_command", global_CFG_SE cfg(global_thin_check_executable_CFG, "thin_check_executable", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, THIN_CHECK_CMD, vsn(2, 2, 94), "@THIN_CHECK_CMD@", 0, NULL, "The full path to the thin_check command.\n" - "LVM uses this command to check that a thin metadata device is in a\n" + "LVM uses this command to check that a thin pool metadata device is in a\n" "usable state. When a thin pool is activated and after it is\n" "deactivated, this command is run. Activation will only proceed if\n" "the command has an exit status of 0. Set to \"\" to skip this check.\n" @@ -1195,6 +1195,12 @@ cfg(global_thin_repair_executable_CFG, "thin_repair_executable", global_CFG_SECT "an unusable state. Also see thin_repair_options.\n" "(See package device-mapper-persistent-data or thin-provisioning-tools)\n") +cfg(global_thin_restore_executable_CFG, "thin_restore_executable", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, THIN_RESTORE_CMD, vsn(2, 3, 22), "@THIN_RESTORE_CMD@", 0, NULL, + "The full path to the thin_restore command.\n" + "LVM uses this command to restore generated data for a thin pool metadata device.\n" + "Also see thin_restore_options.\n" + "(See package device-mapper-persistent-data or thin-provisioning-tools)\n") + cfg_array(global_thin_check_options_CFG, "thin_check_options", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_THIN_CHECK_OPTIONS_CONFIG, vsn(2, 2, 96), NULL, 0, NULL, "List of options passed to the thin_check command.\n" "With thin_check version 2.1 or newer you can add the option\n" @@ -1205,6 +1211,9 @@ cfg_array(global_thin_check_options_CFG, "thin_check_options", global_CFG_SECTIO cfg_array(global_thin_repair_options_CFG, "thin_repair_options", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_THIN_REPAIR_OPTIONS_CONFIG, vsn(2, 2, 100), NULL, 0, NULL, "List of options passed to the thin_repair command.\n") +cfg_array(global_thin_restore_options_CFG, "thin_restore_options", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_THIN_RESTORE_OPTIONS_CONFIG, vsn(2, 3, 22), NULL, 0, NULL, + "List of options passed to the thin_restore command.\n") + cfg_array(global_thin_disabled_features_CFG, "thin_disabled_features", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(2, 2, 99), NULL, 0, NULL, "Features to not use in the thin driver.\n" "This can be helpful for testing, or to avoid using a feature that is\n" @@ -1245,6 +1254,12 @@ cfg(global_cache_repair_executable_CFG, "cache_repair_executable", global_CFG_SE "an unusable state. Also see cache_repair_options.\n" "(See package device-mapper-persistent-data or thin-provisioning-tools)\n") +cfg(global_cache_restore_executable_CFG, "cache_restore_executable", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, CACHE_RESTORE_CMD, vsn(2, 3, 22), "@CACHE_RESTORE_CMD@", 0, NULL, + "The full path to the cache_restore command.\n" + "LVM uses this command to restore generated data for a cache metadata device.\n" + "Also see cache_restore_options.\n" + "(See package device-mapper-persistent-data or thin-provisioning-tools)\n") + cfg_array(global_cache_check_options_CFG, "cache_check_options", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_CHECK_OPTIONS_CONFIG, vsn(2, 2, 108), NULL, 0, NULL, "List of options passed to the cache_check command.\n" "With cache_check version 5.0 or newer you should include the option\n" @@ -1253,6 +1268,9 @@ cfg_array(global_cache_check_options_CFG, "cache_check_options", global_CFG_SECT cfg_array(global_cache_repair_options_CFG, "cache_repair_options", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_REPAIR_OPTIONS_CONFIG, vsn(2, 2, 108), NULL, 0, NULL, "List of options passed to the cache_repair command.\n") +cfg_array(global_cache_restore_options_CFG, "cache_restore_options", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, DEFAULT_CACHE_RESTORE_OPTIONS_CONFIG, vsn(2, 3, 22), NULL, 0, NULL, + "List of options passed to the cache_restore command.\n") + cfg(global_vdo_format_executable_CFG, "vdo_format_executable", global_CFG_SECTION, CFG_ALLOW_EMPTY | CFG_DEFAULT_COMMENTED, CFG_TYPE_STRING, VDO_FORMAT_CMD, VDO_1ST_VSN, "@VDO_FORMAT_CMD@", 0, NULL, "The full path to the vdoformat command.\n" "LVM uses this command to initial data volume for VDO type logical volume\n") diff --git a/lib/config/defaults.h b/lib/config/defaults.h index 571054dc4..dd40ff3bf 100644 --- a/lib/config/defaults.h +++ b/lib/config/defaults.h @@ -117,6 +117,8 @@ #define DEFAULT_THIN_REPAIR_OPTION1 "" #define DEFAULT_THIN_REPAIR_OPTIONS_CONFIG "#S" DEFAULT_THIN_REPAIR_OPTION1 +#define DEFAULT_THIN_RESTORE_OPTION1 "" +#define DEFAULT_THIN_RESTORE_OPTIONS_CONFIG "#S" DEFAULT_THIN_RESTORE_OPTION1 #define DEFAULT_THIN_POOL_METADATA_REQUIRE_SEPARATE_PVS 0 #define DEFAULT_THIN_POOL_CROP_METADATA 0 #define DEFAULT_THIN_POOL_MAX_METADATA_SIZE_V1_KB (UINT64_C(255) * ((1 << 14) - 64) * 4) /* KB */ /* 0x3f8040 blocks */ @@ -145,6 +147,8 @@ #define DEFAULT_CACHE_REPAIR_OPTION1 "" #define DEFAULT_CACHE_REPAIR_OPTIONS_CONFIG "#S" DEFAULT_CACHE_REPAIR_OPTION1 +#define DEFAULT_CACHE_RESTORE_OPTION1 "" +#define DEFAULT_CACHE_RESTORE_OPTIONS_CONFIG "#S" DEFAULT_CACHE_RESTORE_OPTION1 #define DEFAULT_CACHE_POOL_METADATA_REQUIRE_SEPARATE_PVS 0 #define DEFAULT_CACHE_POOL_CHUNK_SIZE 64 /* KB */ #define DEFAULT_CACHE_POOL_MAX_CHUNKS 1000000

1 0

main - tests: update test for automatic virtual size correction
by Zdenek Kabelac 23 Jun '23

23 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=8d09124c6204d49f6bda8… Commit: 8d09124c6204d49f6bda833229c96e8a76665127 Parent: 657dde6208ddc8172b7d0e1466751046c8ddaeaa Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 23 18:03:25 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 23 18:06:22 2023 +0200 tests: update test for automatic virtual size correction lvm_import_vdo will adjust the virtual size within conversion so the volume can be use without any futher tweaking. --- test/shell/vdo-convert.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/shell/vdo-convert.sh b/test/shell/vdo-convert.sh index cb3dd7100..231939cf4 100644 --- a/test/shell/vdo-convert.sh +++ b/test/shell/vdo-convert.sh @@ -61,7 +61,6 @@ aux have_vdo 6 2 5 || skip # # In this case we do not need to move any VDO headers. # -if [ 1 -eq 0 ]; then vgcreate $vg "$dev1" lvcreate -L5G -n $lv1 $vg @@ -139,7 +138,6 @@ lvm_import_vdo --vdo-config "$VDO_CONFIG" -y -v --name $vg1/$lv2 "$dev1" fsck -n "$DM_DEV_DIR/$vg1/$lv2" vgremove -f $vg1 -fi aux wipefs_a "$dev1" @@ -189,6 +187,8 @@ dmsetup table # Get VDO table line dmsetup table "$VDONAME" | tr " " "\n" | sed -e '5,6d' -e '12d' | tee vdo-orig +mkfs.ext4 -E nodiscard "$DM_DEV_DIR/mapper/$VDONAME" + # For conversion we aux lvmconf 'global/vdo_disabled_features = [ "version4" ]' @@ -209,14 +209,22 @@ unset LVM_VDO_PREPARE #lvm_import_vdo --no-snapshot --vdo-config "$VDO_CONFIG" -v -y --name $vg/$lv "$TEST" lvm_import_vdo --vdo-config "$VDO_CONFIG" --uuid-prefix "$PREFIX" -v -y --name $vg/$lv "$TEST" +dmsetup table + +# check our filesystem is OK +fsck -n "$DM_DEV_DIR/$vg/$lv" # Compare converted LV uses same VDO table line dmsetup table "$vg-${lv}_vpool-vpool" | tr " " "\n" | sed -e '5,6d' -e '12d' | tee new-vdo-lv +tail -n+3 vdo-orig >vdo-orig-3 +tail -n+3 new-vdo-lv >new-vdo-lv-3 + # Check there is a match between VDO and LV managed volume # (when differentiating parameters are deleted first) -diff -u vdo-orig new-vdo-lv || die "Found mismatching VDO table lines!" +# we need to skip first 2 lines as the device size gets rounded to match VG extent size +diff -u vdo-orig-3 new-vdo-lv-3 || die "Found mismatching VDO table lines!" -check lv_field $vg/$lv size "<23.00g" +check lv_field $vg/$lv size "23.00g" unset LVM_VDO_PREPARE

1 0

main - lvm_import_vdo: correct the converted virtual size
by Zdenek Kabelac 23 Jun '23

23 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=657dde6208ddc8172b7d0… Commit: 657dde6208ddc8172b7d0e1466751046c8ddaeaa Parent: ea6b5b694bf0886052b048b2e04b941ec65d90f9 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri Jun 23 18:01:32 2023 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Fri Jun 23 18:05:03 2023 +0200 lvm_import_vdo: correct the converted virtual size Ensure the volume after conversion has the properly aligned size to the volume group extent size. This would be visible when using virtual size, that cannot be divided by extent size. Before the user had to manually adjust the size after conversion to get access to all data stored on VDO volume. --- scripts/lvm_import_vdo.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/lvm_import_vdo.sh b/scripts/lvm_import_vdo.sh index bae4b52d1..13197c6fb 100755 --- a/scripts/lvm_import_vdo.sh +++ b/scripts/lvm_import_vdo.sh @@ -357,6 +357,7 @@ convert_lv_() { # For best use the latest version of vdoprepareforlvm tool is required. convert_non_lv_() { local vdo_logicalSize=$1 + local vdo_logicalSizeRounded local extent_size local output local pvfree @@ -417,7 +418,7 @@ convert_non_lv_() { # Round virtual size to the LOWER size expressed in extent units. # lvm is parsing VDO metadata and can read real full size and use it instead of this smaller value. # To precisely byte-synchronize the size of VDO LV, user can lvresize such VDO LV later. - vdo_logicalSize=$(( ( vdo_logicalSize / extent_size ) * extent_size )) + vdo_logicalSizeRounded=$(( ( vdo_logicalSize / extent_size ) * extent_size )) verbose "Creating VG \"${NAME%/*}\" with extent size $extent_size KiB." dry "$LVM" vgcreate $YES $VERB --devices "$devices" -s "${extent_size}k" "$VGNAME" "$devices" || { @@ -428,7 +429,12 @@ convert_non_lv_() { dry "$LVM" lvcreate -Zn -Wn -an $YES $VERB --devices "$devices" -l100%VG -n "${LVNAME}_vpool" "$VGNAME" "$devices" verbose "Converting to VDO pool." - dry "$LVM" lvconvert $YES $VERB $FORCE --devices "$devices" --config "$VDO_ALLOCATION_PARAMS" -Zn -V "${vdo_logicalSize}k" -n "$LVNAME" --type vdo-pool "$VGNAME/${LVNAME}_vpool" + dry "$LVM" lvconvert $YES $VERB $FORCE --devices "$devices" --config "$VDO_ALLOCATION_PARAMS" -Zn -V "${vdo_logicalSizeRounded}k" -n "$LVNAME" --type vdo-pool "$VGNAME/${LVNAME}_vpool" + if [ "$vdo_logicalSizeRounded" -lt "$vdo_logicalSize" ] ; then + # need to extend virtal size to be covering all the converted area + # let lvm2 to round to the proper virtual size of VDO LV + dry "$LVM" lvextend $YES $VERB --fs ignore --devices "$devices" -L "$vdo_logicalSize"k "$VGNAME/$LVNAME" + fi dry "$LVM" vgchange -an $VERB $FORCE --devices "$devices" "$VGNAME"

1 0

main - lvcreate: allow thin snapshot syntax that broke
by David Teigland 20 Jun '23

20 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=ea6b5b694bf0886052b04… Commit: ea6b5b694bf0886052b048b2e04b941ec65d90f9 Parent: 1dbb86f8c7cd95cb484a5b3c465b847f35d2b760 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 20 15:41:24 2023 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jun 20 15:47:01 2023 -0500 lvcreate: allow thin snapshot syntax that broke The command "lvcreate --type thin --snapshot ..." to create a thin snapshot would fail. commit d651b340e68d97ada25e558eb50aa40062bba936 removed the optional "--type thin" from the command definition "lvcreate --snapshot LV_thin", and added --type thin as AUTOTYPE. This was correct and should not have changed anything if all the command defs were correct, but it broke the "lvcreate --type thin --snapshot" case. It reveals a problem in a different command definintion: "lvcreate --type thin LV_thin" that was missing --snapshot in its OO list. --- test/shell/lvcreate-thin-snap.sh | 20 ++++++++++++++++++++ tools/command-lines.in | 6 +++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/test/shell/lvcreate-thin-snap.sh b/test/shell/lvcreate-thin-snap.sh index 6e6410cc1..8f1987986 100644 --- a/test/shell/lvcreate-thin-snap.sh +++ b/test/shell/lvcreate-thin-snap.sh @@ -74,5 +74,25 @@ lvcreate -L10M --zero n -T $vg/pool -V10M --name $lv1 mkfs.ext4 "$DM_DEV_DIR/$vg/$lv1" lvcreate -K -s $vg/$lv1 --name snap fsck -n "$DM_DEV_DIR/$vg/snap" +vgchange -an $vg +lvremove -y $vg + +# One thin pool and one thin LV +lvcreate --type thin-pool -L 10M -n tp $vg +lvcreate --type thin -n thin1 -V 20M --thinpool tp $vg +# Different syntaxes for creating a thin snapshot +lvcreate --type thin -n snap1 $vg/thin1 +lvcreate --type thin --snapshot -n snap2 $vg/thin1 +lvcreate --type thin --thin -n snap3 $vg/thin1 +lvcreate --type thin --snapshot --thin -n snap4 $vg/thin1 +lvcreate --snapshot -n snap5 $vg/thin1 +lvcreate --thin -n snap6 $vg/thin1 +# The command defs allow --snapshot --thin, but the internal +# lvcreate option checks disallow it. It doesn't seem to make +# sense to disallow this from a syntax point of view, but it's +# possible that the lvcreate implementation would do the wrong +# thing (that should probably be fixed.) +not lvcreate --thin --snapshot -n snap7 $vg/thin1 +vgchange -an $vg vgremove -ff $vg diff --git a/tools/command-lines.in b/tools/command-lines.in index 3d311288f..bb6e09933 100644 --- a/tools/command-lines.in +++ b/tools/command-lines.in @@ -1088,7 +1088,7 @@ AUTOTYPE: thin --- lvcreate --type thin LV_thin -OO: --thin, OO_LVCREATE +OO: --thin, --snapshot, OO_LVCREATE IO: --mirrors 0 ID: lvcreate_thin_snapshot DESC: Create a thin LV that is a snapshot of an existing thin LV. @@ -1096,7 +1096,7 @@ FLAGS: SECONDARY_SYNTAX # alternate form of lvcreate --type thin lvcreate --thin LV_thin -OO: OO_LVCREATE +OO: --snapshot, OO_LVCREATE IO: --mirrors 0 ID: lvcreate_thin_snapshot DESC: Create a thin LV that is a snapshot of an existing thin LV. @@ -1105,7 +1105,7 @@ AUTOTYPE: thin # alternate form of lvcreate --type thin lvcreate --snapshot LV_thin -OO: OO_LVCREATE +OO: --thin, OO_LVCREATE IO: --mirrors 0 ID: lvcreate_thin_snapshot DESC: Create a thin LV that is a snapshot of an existing thin LV.

1 0

main - tests: lvresize fs mounted multiple times
by David Teigland 20 Jun '23

20 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=1dbb86f8c7cd95cb484a5… Commit: 1dbb86f8c7cd95cb484a5b3c465b847f35d2b760 Parent: 7c3eca833ff7878d6d32198ed76380c91fdc15fc Author: David Teigland <teigland(a)redhat.com> AuthorDate: Tue Jun 20 13:13:06 2023 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Tue Jun 20 13:13:06 2023 -0500 tests: lvresize fs mounted multiple times --- test/shell/lvresize-fs.sh | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/test/shell/lvresize-fs.sh b/test/shell/lvresize-fs.sh index cf93a4222..d2c4ac707 100644 --- a/test/shell/lvresize-fs.sh +++ b/test/shell/lvresize-fs.sh @@ -38,6 +38,8 @@ mkdir -p "$mount_dir" mount_dir_space="other mnt dir" mkdir -p "$mount_dir_space" +mount_dir_2="mnt_lvresize_fs_2" +mkdir -p "$mount_dir_2" # Test combinations of the following: # lvreduce / lvextend @@ -207,6 +209,47 @@ umount "$mount_dir_space" lvremove -f $vg/$lv3 +################################# +# +# lvextend, ext4, multiple mounts +# +################################# + +# Use one instance of ext4 for series of lvextend tests: +lvcreate -n $lv -L 32M $vg +mkfs.ext4 "$DM_DEV_DIR/$vg/$lv" +mount "$DM_DEV_DIR/$vg/$lv" "$mount_dir" +mount "$DM_DEV_DIR/$vg/$lv" "$mount_dir_2" + +# lvextend, ext4, active, mounted twice, -r +lvextend -r -L+8M $vg/$lv +check lv_field $vg/$lv lv_size "40.00m" + +workaround_ + +lvrename $vg/$lv $vg/$lv2 +not lvextend -r -L+8M $vg/$lv2 +not lvreduce -r -L-8M $vg/$lv2 +umount "$mount_dir" +umount "$mount_dir_2" +lvextend -r -L+8M $vg/$lv2 + +mount "$DM_DEV_DIR/$vg/$lv2" "$mount_dir" +mount --bind "$mount_dir" "$mount_dir_2" +lvextend -r -L+8M $vg/$lv2 +check lv_field $vg/$lv2 lv_size "56.00m" +lvrename $vg/$lv2 $vg/$lv3 +not lvextend -r -L+8M $vg/$lv3 +not lvreduce -r -L-8M $vg/$lv3 +umount "$mount_dir" +umount "$mount_dir_2" +mount "$DM_DEV_DIR/$vg/$lv3" "$mount_dir" +lvextend -r -L+8M $vg/$lv3 +lvreduce -r -y -L-8M $vg/$lv3 +umount "$mount_dir" + +lvremove -f $vg/$lv3 + ##################################### # # Now let do some unmounted tests

1 0

main - lvresize: fix multiple mounts
by David Teigland 16 Jun '23

16 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=7c3eca833ff7878d6d321… Commit: 7c3eca833ff7878d6d32198ed76380c91fdc15fc Parent: 228a8e8c1fd8e82a2e31a6060614dc3dd2f8bc51 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jun 16 12:06:40 2023 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jun 16 12:11:51 2023 -0500 lvresize: fix multiple mounts which was mistaken as a mounted LV that had been renamed. --- lib/device/filesystem.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/lib/device/filesystem.c b/lib/device/filesystem.c index 2572bca69..39e563117 100644 --- a/lib/device/filesystem.c +++ b/lib/device/filesystem.c @@ -243,8 +243,6 @@ int fs_mount_state_is_misnamed(struct cmd_context *cmd, struct logical_volume *l FILE *fme = NULL; struct mntent *me; int renamed = 0; - int found_dir = 0; - int found_dev = 0; int dev_match, dir_match; if (stat(lv_path, &st_lv) < 0) { @@ -281,6 +279,9 @@ int fs_mount_state_is_misnamed(struct cmd_context *cmd, struct logical_volume *l } endmntent(fme); + if (mtab_mntpath[0]) + log_debug("%s mtab mntpath %s", display_lvname(lv), mtab_mntpath); + /* * In mtab dir path, replace each ascii space character with the * four characters \040 which is how /proc/mounts represents spaces. @@ -319,15 +320,31 @@ int fs_mount_state_is_misnamed(struct cmd_context *cmd, struct logical_volume *l if (strcmp(fstype, proc_fstype)) continue; + /* + * When an LV is mounted on two dirs, it appears in /proc/mounts twice as + * /dev/mapper/vg-lvol0 on /foo type xfs ... + * /dev/mapper/vg-lvol0 on /bar type xfs ... + * All entries match dm_devpath, one entry matches mntpath, + * and other entries don't match mntpath. + * + * When an LV is mounted on one dir, and is renamed from lvol0 to lvol1, + * it appears in /proc/mounts once as + * /dev/mapper/vg-lvol0 on /foo type xfs ... + */ + dir_match = !strcmp(mtab_mntpath, proc_mntpath); dev_match = !strcmp(dm_devpath, proc_devpath); - if (dir_match) - found_dir++; - if (dev_match) - found_dev++; + if (!dir_match && !dev_match) + continue; + + if (dev_match && !dir_match) { + log_debug("LV %s mounted at %s also mounted at %s.", + dm_devpath, mtab_mntpath, proc_mntpath); + continue; + } - if (dir_match != dev_match) { + if (!dev_match && dir_match) { log_error("LV %s mounted at %s may have been renamed (from %s).", dm_devpath, proc_mntpath, proc_devpath); renamed = 1; @@ -337,26 +354,10 @@ int fs_mount_state_is_misnamed(struct cmd_context *cmd, struct logical_volume *l if (fclose(fp)) stack; - /* - * Don't try resizing if: - * - different device names apppear for the mount point - * (LVs probably renamed while mounted), or - * - the mount point for the LV appears multiple times, or - * - the LV device is listed for multiple mounts. - */ if (renamed) { log_error("File system resizing not supported: fs utilities do not support renamed devices."); return 1; } - /* These two are likely detected as renamed, but include checks in case. */ - if (found_dir > 1) { - log_error("File system resizing not supported: %s appears more than once in /proc/mounts.", mtab_mntpath); - return 1; - } - if (found_dev > 1) { - log_error("File system resizing not supported: %s appears more than once in /proc/mounts.", dm_devpath); - return 1; - } return 0; }

1 0

main - device_id: ignore leading and trailing spaces for sys_wwid and sys_serial
by David Teigland 15 Jun '23

15 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=228a8e8c1fd8e82a2e31a… Commit: 228a8e8c1fd8e82a2e31a6060614dc3dd2f8bc51 Parent: f0b48a23d9d8b5d858be1772ea5c9083d235b3b3 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Jun 15 13:58:48 2023 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Jun 15 15:17:14 2023 -0500 device_id: ignore leading and trailing spaces for sys_wwid and sys_serial Leading and trailing underscores are also ignored to handle device ids written by previous versions which replaced all spaces with underscores. --- lib/device/device.h | 1 + lib/device/device_id.c | 280 ++++++++++++++++++++++++-------------- lib/device/parse_vpd.c | 50 +++++++ test/shell/devicesfile-vpd-ids.sh | 101 ++++++++++++-- 4 files changed, 313 insertions(+), 119 deletions(-) diff --git a/lib/device/device.h b/lib/device/device.h index 446104218..84d87232b 100644 --- a/lib/device/device.h +++ b/lib/device/device.h @@ -239,6 +239,7 @@ int dev_mpath_init(const char *config_wwids_file); void dev_mpath_exit(void); int parse_vpd_ids(const unsigned char *vpd_data, int vpd_datalen, struct dm_list *ids); int format_t10_id(const unsigned char *in, int in_bytes, unsigned char *out, int out_bytes); +int format_general_id(const char *in, int in_bytes, unsigned char *out, int out_bytes); int parse_vpd_serial(const unsigned char *in, char *out, int outsize); /* dev_util */ diff --git a/lib/device/device_id.c b/lib/device/device_id.c index 9a8716500..87fcf32ba 100644 --- a/lib/device/device_id.c +++ b/lib/device/device_id.c @@ -185,6 +185,71 @@ void free_dids(struct dm_list *ids) } } +/* More than one _ in a row is replaced with one _ */ +static void _reduce_repeating_underscores(char *buf, int bufsize) +{ + char *tmpbuf; + int us = 0, i, j = 0; + + if (!(tmpbuf = strndup(buf, bufsize-1))) + return; + + memset(buf, 0, bufsize); + + for (i = 0; i < strlen(tmpbuf); i++) { + if (tmpbuf[i] == '_') + us++; + else + us = 0; + + if (us == 1) + buf[j++] = '_'; + else if (us > 1) + continue; + else + buf[j++] = tmpbuf[i]; + + if (j == bufsize) + break; + } + buf[bufsize-1] = '\0'; + free(tmpbuf); +} + +static void _remove_leading_underscores(char *buf, int bufsize) +{ + char *tmpbuf; + int i, j = 0; + + if (buf[0] != '_') + return; + + if (!(tmpbuf = strndup(buf, bufsize-1))) + return; + + memset(buf, 0, bufsize); + + for (i = 0; i < strlen(tmpbuf); i++) { + if (!j && tmpbuf[i] == '_') + continue; + buf[j++] = tmpbuf[i]; + + if (j == bufsize) + break; + } + free(tmpbuf); +} + +static void _remove_trailing_underscores(char *buf, int bufsize) +{ + char *end; + + end = buf + strlen(buf) - 1; + while ((end > buf) && (*end == '_')) + end--; + end[1] = '\0'; +} + static int _read_sys_block(struct cmd_context *cmd, struct device *dev, const char *suffix, char *sysbuf, int sysbufsize, int binary, int *retlen) @@ -406,7 +471,7 @@ struct dev_wwid *dev_add_wwid(char *id, int id_type, struct dm_list *ids) int dev_read_vpd_wwids(struct cmd_context *cmd, struct device *dev) { - unsigned char vpd_data[VPD_SIZE] = { 0 }; + char vpd_data[VPD_SIZE] = { 0 }; int vpd_datalen = 0; dev->flags |= DEV_ADDED_VPD_WWIDS; @@ -417,36 +482,47 @@ int dev_read_vpd_wwids(struct cmd_context *cmd, struct device *dev) return 0; /* adds dev_wwid entry to dev->wwids for each id in vpd data */ - parse_vpd_ids(vpd_data, vpd_datalen, &dev->wwids); + parse_vpd_ids((const unsigned char *)vpd_data, vpd_datalen, &dev->wwids); return 1; } int dev_read_sys_wwid(struct cmd_context *cmd, struct device *dev, - char *buf, int bufsize, struct dev_wwid **dw_out) + char *outbuf, int outbufsize, struct dev_wwid **dw_out) { - char tmpbuf[DEV_WWID_SIZE]; + char buf[DEV_WWID_SIZE] = { 0 }; struct dev_wwid *dw; - int ret; + int is_t10 = 0; + int i, ret; dev->flags |= DEV_ADDED_SYS_WWID; - ret = read_sys_block(cmd, dev, "device/wwid", buf, bufsize); + ret = read_sys_block(cmd, dev, "device/wwid", buf, sizeof(buf)); if (!ret || !buf[0]) { /* the wwid file is not under device for nvme devs */ - ret = read_sys_block(cmd, dev, "wwid", buf, bufsize); + ret = read_sys_block(cmd, dev, "wwid", buf, sizeof(buf)); } if (!ret || !buf[0]) return 0; - /* in t10 id, replace characters like space and quote */ - if (!strncmp(buf, "t10.", 4)) { - if (bufsize < DEV_WWID_SIZE) - return 0; - memcpy(tmpbuf, buf, DEV_WWID_SIZE); - memset(buf, 0, bufsize); - format_t10_id((const unsigned char *)tmpbuf, DEV_WWID_SIZE, (unsigned char *)buf, bufsize); + for (i = 0; i < sizeof(buf) - 4; i++) { + if (buf[i] == ' ') + continue; + if (!strncmp(&buf[i], "t10", 3)) + is_t10 = 1; + break; } + /* + * Remove leading and trailing spaces. + * Replace internal spaces with underscores. + * t10 wwids have multiple sequential spaces + * replaced by a single underscore. + */ + if (is_t10) + format_t10_id((const unsigned char *)buf, sizeof(buf), (unsigned char *)outbuf, outbufsize); + else + format_general_id((const char *)buf, sizeof(buf), (unsigned char *)outbuf, outbufsize); + /* Note, if wwids are also read from vpd, this same wwid will be added again. */ if (!(dw = dev_add_wwid(buf, 0, &dev->wwids))) @@ -457,9 +533,9 @@ int dev_read_sys_wwid(struct cmd_context *cmd, struct device *dev, } static int _dev_read_sys_serial(struct cmd_context *cmd, struct device *dev, - char *buf, int bufsize) + char *outbuf, int outbufsize) { - unsigned char vpd_data[VPD_SIZE] = { 0 }; + char buf[VPD_SIZE] = { 0 }; const char *devname; int vpd_datalen = 0; @@ -471,13 +547,16 @@ static int _dev_read_sys_serial(struct cmd_context *cmd, struct device *dev, * (Only virtio disks /dev/vdx are known to use /sys/class/block/vdx/serial.) */ - read_sys_block(cmd, dev, "device/serial", buf, bufsize); - if (buf[0]) - return 1; + read_sys_block(cmd, dev, "device/serial", buf, sizeof(buf)); + if (buf[0]) { + format_general_id((const char *)buf, sizeof(buf), (unsigned char *)outbuf, outbufsize); + if (outbuf[0]) + return 1; + } - if (read_sys_block_binary(cmd, dev, "device/vpd_pg80", (char *)vpd_data, VPD_SIZE, &vpd_datalen) && vpd_datalen) { - parse_vpd_serial(vpd_data, buf, bufsize); - if (buf[0]) + if (read_sys_block_binary(cmd, dev, "device/vpd_pg80", buf, VPD_SIZE, &vpd_datalen) && vpd_datalen) { + parse_vpd_serial((const unsigned char *)buf, outbuf, outbufsize); + if (outbuf[0]) return 1; } @@ -505,12 +584,13 @@ static int _dev_read_sys_serial(struct cmd_context *cmd, struct device *dev, if (dm_snprintf(path, sizeof(path), "%s/class/block/%s/serial", sysfs_dir, vdx) < 0) return 0; - ret = get_sysfs_value(path, buf, bufsize, 0); + ret = get_sysfs_value(path, buf, sizeof(buf), 0); if (ret && !buf[0]) ret = 0; if (ret) { - buf[bufsize - 1] = '\0'; - return 1; + format_general_id((const char *)buf, sizeof(buf), (unsigned char *)outbuf, outbufsize); + if (buf[0]) + return 1; } } @@ -520,6 +600,7 @@ static int _dev_read_sys_serial(struct cmd_context *cmd, struct device *dev, const char *device_id_system_read(struct cmd_context *cmd, struct device *dev, uint16_t idtype) { char sysbuf[PATH_MAX] = { 0 }; + char sysbuf2[PATH_MAX] = { 0 }; const char *idname = NULL; struct dev_wwid *dw; int i; @@ -584,16 +665,45 @@ const char *device_id_system_read(struct cmd_context *cmd, struct device *dev, u return NULL; } - /* wwids are already munged if needed */ - if (idtype != DEV_ID_TYPE_SYS_WWID) { + /* + * Replace all spaces, quotes, control chars with underscores. + * sys_wwid, sys_serial, and wwid_* have already been handled, + * and with slightly different replacement (see format_t10_id, + * format_general_id.) + */ + if ((idtype != DEV_ID_TYPE_SYS_WWID) && + (idtype != DEV_ID_TYPE_SYS_SERIAL) && + (idtype != DEV_ID_TYPE_WWID_NAA) && + (idtype != DEV_ID_TYPE_WWID_EUI) && + (idtype != DEV_ID_TYPE_WWID_T10)) { for (i = 0; i < strlen(sysbuf); i++) { - if (sysbuf[i] == '"') - continue; - if (isblank(sysbuf[i]) || isspace(sysbuf[i]) || iscntrl(sysbuf[i])) + if ((sysbuf[i] == '"') || + isblank(sysbuf[i]) || + isspace(sysbuf[i]) || + iscntrl(sysbuf[i])) sysbuf[i] = '_'; } } + /* + * Reduce actual leading and trailing underscores for sys_wwid + * and sys_serial, since underscores were previously used as + * replacements for leading/trailing spaces which are now ignored. + * Also reduce any actual repeated underscores in t10 wwid since + * multiple repeated spaces were also once replaced by underscores. + */ + if ((idtype == DEV_ID_TYPE_SYS_WWID) || + (idtype == DEV_ID_TYPE_SYS_SERIAL)) { + memcpy(sysbuf2, sysbuf, sizeof(sysbuf2)); + _remove_leading_underscores(sysbuf2, sizeof(sysbuf2)); + _remove_trailing_underscores(sysbuf2, sizeof(sysbuf2)); + if (idtype == DEV_ID_TYPE_SYS_WWID && !strncmp(sysbuf2, "t10", 3) && strstr(sysbuf2, "__")) + _reduce_repeating_underscores(sysbuf2, sizeof(sysbuf2)); + if (memcmp(sysbuf, sysbuf2, sizeof(sysbuf))) + log_debug("device_id_system_read reduced underscores %s to %s", sysbuf, sysbuf2); + memcpy(sysbuf, sysbuf2, sizeof(sysbuf)); + } + if (!sysbuf[0]) goto bad; @@ -1728,40 +1838,6 @@ static int _match_dm_devnames(struct cmd_context *cmd, struct device *dev, return 0; } -/* More than one _ in a row is replaced with one _ */ -static void _reduce_repeating_underscores(char *in, int in_len, char *out, int out_size) -{ - int us = 0, i, j = 0; - - for (i = 0; i < in_len; i++) { - if (in[i] == '_') - us++; - else - us = 0; - - if (us == 1) - out[j++] = '_'; - else if (us > 1) - continue; - else - out[j++] = in[i]; - - if (j == out_size) - break; - } -} - -/* Remove any _ at the end of the string. */ -static void _remove_trailing_underscores(char *buf) -{ - char *end; - - end = buf + strlen(buf) - 1; - while ((end > buf) && (*end == '_')) - end--; - end[1] = '\0'; -} - /* * du is a devices file entry. dev is any device on the system. * check if du is for dev by comparing the device's ids to du->idname. @@ -1775,8 +1851,7 @@ static void _remove_trailing_underscores(char *buf) static int _match_du_to_dev(struct cmd_context *cmd, struct dev_use *du, struct device *dev) { - char du_t10[DEV_WWID_SIZE] = { 0 }; - char id_t10[DEV_WWID_SIZE]; + char du_idname[PATH_MAX]; struct dev_id *id; const char *idname; int part; @@ -1827,20 +1902,30 @@ static int _match_du_to_dev(struct cmd_context *cmd, struct dev_use *du, struct } /* - * Devices file entries with IDTYPE=sys_wwid and a T10 WWID - * for IDNAME were saved in the past with each space replaced - * by one _. Now we convert multiple spaces to a single _. - * So, convert a df entry with the old style to the new shorter - * style to compare. Also, in past versions, trailing spaces - * in the wwid would be replaced by _, but now trailing spaces - * are ignored. This means devices file entries created by - * past versions may have _ at the end of the IDNAME string. - * So, exclude trailing underscores when comparing a t10 wwid - * from a device with a t10 wwid in the devices file. + * sys_wwid and sys_serial were saved in the past with leading and + * trailing spaces replaced with underscores, and t10 wwids also had + * repeated internal spaces replaced with one underscore each. Now we + * ignore leading and trailing spaces and replace multiple repeated + * spaces with one underscore in t10 wwids. In order to handle + * system.devices entries created by older versions, modify the IDNAME + * value that's read (du->idname) to remove leading and trailing + * underscores, and reduce repeated underscores to one in t10 wwids. + * + * Example: wwid is reported as " t10.123 456 " (without quotes) + * Previous versions would save this in system.devices as: __t10.123__456__ + * Current versions will save this in system.devices as: t10.123_456 + * device_id_system_read() now returns: t10.123_456 + * When this code reads __t10.123__456__ from system.devices, that + * string is modified to t10.123_456 so that it will match the value + * returned from device_id_system_read(). */ - if (du->idtype == DEV_ID_TYPE_SYS_WWID && !strncmp(du->idname, "t10", 3) && strchr(du->idname, '_')) { - _reduce_repeating_underscores(du->idname, strlen(du->idname), du_t10, sizeof(du_t10) - 1); - _remove_trailing_underscores(du_t10); + strncpy(du_idname, du->idname, PATH_MAX-1); + if (((du->idtype == DEV_ID_TYPE_SYS_WWID) || (du->idtype == DEV_ID_TYPE_SYS_SERIAL)) && + strchr(du_idname, '_')) { + _remove_leading_underscores(du_idname, sizeof(du_idname)); + _remove_trailing_underscores(du_idname, sizeof(du_idname)); + if (du->idtype == DEV_ID_TYPE_SYS_WWID && !strncmp(du_idname, "t10", 3) && strstr(du_idname, "__")) + _reduce_repeating_underscores(du_idname, sizeof(du_idname)); } /* @@ -1848,21 +1933,14 @@ static int _match_du_to_dev(struct cmd_context *cmd, struct dev_use *du, struct * (and saved on dev->ids to avoid rereading.) */ dm_list_iterate_items(id, &dev->ids) { - if (id->idtype == du->idtype) { + if (!id->idname) + continue; + if (id->idtype == du->idtype) { /* - * For t10 wwids, remove actual trailing underscores from the dev wwid - * (in id->idname), because all trailing underscores were removed from - * the du->idname read from the devices file. i.e. no trailing _ are - * used in t10 wwid comparisons. + * dm names can have different forms, so matching names + * is not always a direct comparison. */ - if ((id->idtype == DEV_ID_TYPE_SYS_WWID) && - id->idname && !strncmp(id->idname, "t10", 3) && du_t10[0]) { - memset(id_t10, 0, sizeof(id_t10)); - strncpy(id_t10, id->idname, DEV_WWID_SIZE-1); - _remove_trailing_underscores(id_t10); - } - if ((id->idtype == DEV_ID_TYPE_DEVNAME) && _match_dm_devnames(cmd, dev, id, du)) { /* dm devs can have differing names that we know still match */ du->dev = dev; @@ -1871,22 +1949,16 @@ static int _match_du_to_dev(struct cmd_context *cmd, struct dev_use *du, struct log_debug("Match device_id %s %s to %s: dm names", idtype_to_str(du->idtype), du->idname, dev_name(dev)); return 1; + } - } else if (id->idname && !strcmp(id->idname, du->idname)) { + if (!strcmp(id->idname, du_idname)) { du->dev = dev; dev->id = id; dev->flags |= DEV_MATCHED_USE_ID; log_debug("Match device_id %s %s to %s", - idtype_to_str(du->idtype), du->idname, dev_name(dev)); + idtype_to_str(du->idtype), du_idname, dev_name(dev)); return 1; - } else if ((id->idtype == DEV_ID_TYPE_SYS_WWID) && du_t10[0] && id_t10[0] && !strcmp(id_t10, du_t10)) { - du->dev = dev; - dev->id = id; - dev->flags |= DEV_MATCHED_USE_ID; - log_debug("Match device_id %s %s to %s", - idtype_to_str(du->idtype), du->idname, dev_name(dev)); - return 1; } else { /* log_debug("Mismatch device_id %s %s to %s: idname %s", @@ -1913,12 +1985,12 @@ static int _match_du_to_dev(struct cmd_context *cmd, struct dev_use *du, struct id->dev = dev; dm_list_add(&dev->ids, &id->list); - if (idname && !strcmp(idname, du->idname)) { + if (idname && !strcmp(idname, du_idname)) { du->dev = dev; dev->id = id; dev->flags |= DEV_MATCHED_USE_ID; log_debug("Match device_id %s %s to %s", - idtype_to_str(du->idtype), du->idname, dev_name(dev)); + idtype_to_str(du->idtype), idname, dev_name(dev)); return 1; } @@ -1944,7 +2016,7 @@ static int _match_du_to_dev(struct cmd_context *cmd, struct dev_use *du, struct dev_read_vpd_wwids(cmd, dev); dm_list_iterate_items(dw, &dev->wwids) { - if (!strcmp(dw->id, du->idname)) { + if (!strcmp(dw->id, du_idname)) { if (!(id = zalloc(sizeof(struct dev_id)))) return_0; /* wwid types are 1,2,3 and idtypes are DEV_ID_TYPE_ */ @@ -1956,7 +2028,7 @@ static int _match_du_to_dev(struct cmd_context *cmd, struct dev_use *du, struct dev->id = id; dev->flags |= DEV_MATCHED_USE_ID; log_print_unless_silent("Match device_id %s %s to vpd_pg83 %s %s.", - idtype_to_str(du->idtype), du->idname, + idtype_to_str(du->idtype), du_idname, idtype_to_str(id->idtype), dev_name(dev)); du->idtype = id->idtype; return 1; diff --git a/lib/device/parse_vpd.c b/lib/device/parse_vpd.c index c1ac974fd..938277e38 100644 --- a/lib/device/parse_vpd.c +++ b/lib/device/parse_vpd.c @@ -36,7 +36,57 @@ #include <assert.h> /* + * Remove leading spaces. + * Remove trailing spaces. + * Replace each space with underscore. + * Skip quotes, non-ascii, non-printable. + */ +int format_general_id(const char *in, int in_bytes, unsigned char *out, int out_bytes) +{ + const char *end; + int end_bytes = strlen(in); + int retlen = 0; + int j = 0; + int i; + + if (!end_bytes) + return 0; + + end = in + end_bytes - 1; + while ((end > in) && (*end == ' ')) { + end--; + end_bytes--; + } + + for (i = 0; i < end_bytes; i++) { + if (!in[i]) + break; + if (j >= (out_bytes - 2)) + break; + /* skip leading spaces */ + if (!retlen && (in[i] == ' ')) + continue; + /* skip non-ascii non-printable characters */ + if (!isascii(in[i]) || !isprint(in[i])) + continue; + /* skip quote */ + if (in[i] == '"') + continue; + /* replace each space with _ */ + if (in[i] == ' ') + out[j++] = '_'; + else + out[j++] = in[i]; + retlen++; + } + return retlen; +} + +/* + * Remove leading spaces. + * Remove trailing spaces. * Replace series of spaces with a single _. + * Skip quotes, non-ascii, non-printable. */ int format_t10_id(const unsigned char *in, int in_bytes, unsigned char *out, int out_bytes) { diff --git a/test/shell/devicesfile-vpd-ids.sh b/test/shell/devicesfile-vpd-ids.sh index 52805737b..04dbae7d0 100644 --- a/test/shell/devicesfile-vpd-ids.sh +++ b/test/shell/devicesfile-vpd-ids.sh @@ -223,8 +223,8 @@ cleanup_sysfs # Test t10 wwid containing quote rm $DF aux wipefs_a "$DEV1" -mkdir -p $SYS_DIR/dev/block/$MAJOR1:$MINOR1/ -echo "t10.ATA_2.5\"_SATA_SSD_1112-A___111111111111" > $SYS_DIR/dev/block/$MAJOR1:$MINOR1/wwid +mkdir -p $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device +echo "t10.ATA_2.5\"_SATA_SSD_1112-A___111111111111" > $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid lvmdevices --adddev "$DEV1" cat $DF vgcreate $vg "$DEV1" @@ -241,19 +241,19 @@ grep sys_wwid $DF grep 2.5_SATA_SSD $DF lvremove -y $vg vgremove $vg -rm $SYS_DIR/dev/block/$MAJOR1:$MINOR1/wwid +rm $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid cleanup_sysfs # Test t10 wwid with trailing space and line feed at the end rm $DF aux wipefs_a "$DEV1" -mkdir -p $SYS_DIR/dev/block/$MAJOR1:$MINOR1/ +mkdir -p $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device echo -n "7431 302e 4154 4120 2020 2020 5642 4f58 \ 2048 4152 4444 4953 4b20 2020 2020 2020 \ 2020 2020 2020 2020 2020 2020 2020 2020 \ 2020 2020 5642 3963 3130 6433 3138 2d31 \ -3838 6439 6562 6320 0a" | xxd -r -p > $SYS_DIR/dev/block/$MAJOR1:$MINOR1/wwid -cat $SYS_DIR/dev/block/$MAJOR1:$MINOR1/wwid +3838 6439 6562 6320 0a" | xxd -r -p > $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid +cat $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid lvmdevices --adddev "$DEV1" cat $DF vgcreate $vg "$DEV1" @@ -266,19 +266,19 @@ grep sys_wwid out grep sys_wwid $DF lvremove -y $vg vgremove $vg -rm $SYS_DIR/dev/block/$MAJOR1:$MINOR1/wwid +rm $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid cleanup_sysfs # Test t10 wwid with trailing space at the end that was created by 9.0/9.1 rm $DF aux wipefs_a "$DEV1" -mkdir -p $SYS_DIR/dev/block/$MAJOR1:$MINOR1/ +mkdir -p $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device echo -n "7431 302e 4154 4120 2020 2020 5642 4f58 \ 2048 4152 4444 4953 4b20 2020 2020 2020 \ 2020 2020 2020 2020 2020 2020 2020 2020 \ 2020 2020 5642 3963 3130 6433 3138 2d31 \ -3838 6439 6562 6320 0a" | xxd -r -p > $SYS_DIR/dev/block/$MAJOR1:$MINOR1/wwid -cat $SYS_DIR/dev/block/$MAJOR1:$MINOR1/wwid +3838 6439 6562 6320 0a" | xxd -r -p > $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid +cat $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid lvmdevices --adddev "$DEV1" cat $DF vgcreate $vg "$DEV1" @@ -311,20 +311,20 @@ pvs pvs -o+deviceidtype,deviceid "$DEV1" lvremove -y $vg vgremove $vg -rm $SYS_DIR/dev/block/$MAJOR1:$MINOR1/wwid +rm $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid cleanup_sysfs # test a t10 wwid that has actual trailing underscore which # is followed by a trailing space. rm $DF aux wipefs_a "$DEV1" -mkdir -p $SYS_DIR/dev/block/$MAJOR1:$MINOR1/ +mkdir -p $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device echo -n "7431 302e 4154 4120 2020 2020 5642 4f58 \ 2048 4152 4444 4953 4b20 2020 2020 2020 \ 2020 2020 2020 2020 2020 2020 2020 2020 \ 2020 2020 5642 3963 3130 6433 3138 2d31 \ -3838 6439 6562 5f20 0a" | xxd -r -p > $SYS_DIR/dev/block/$MAJOR1:$MINOR1/wwid -cat $SYS_DIR/dev/block/$MAJOR1:$MINOR1/wwid +3838 6439 6562 5f20 0a" | xxd -r -p > $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid +cat $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid # The wwid has an actual underscore char (5f) followed by a space char (20) # 9.1 converts the trailing space to an underscore T10_WWID_RHEL91="t10.ATA_____VBOX_HARDDISK___________________________VB9c10d318-188d9eb__" @@ -352,9 +352,80 @@ pvs pvs -o+deviceidtype,deviceid "$DEV1" lvremove -y $vg vgremove $vg -rm $SYS_DIR/dev/block/$MAJOR1:$MINOR1/wwid +rm $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid +cleanup_sysfs + +# +# Test trailing/leading/center spaces in sys_wwid and sys_serial device +# ids, and that old system.devices files that have trailing/leading +# underscores are understood. +# + +rm $DF +aux wipefs_a "$DEV1" +mkdir -p $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device +echo -n " s123 456 " > $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/serial +lvmdevices --adddev "$DEV1" +cat $DF +grep "IDNAME=s123__456 DEVNAME" $DF +vgcreate $vg "$DEV1" +PVID1=`pvs "$DEV1" --noheading -o uuid | tr -d - | awk '{print $1}'` +cat $DF | grep -v IDNAME > $DFTMP +cat $DFTMP +echo "IDTYPE=sys_serial IDNAME=__s123__456__ DEVNAME=${DEV1} PVID=${PVID1}" >> $DFTMP +cp $DFTMP $DF +cat $DF +vgs +pvs -o+deviceidtype,deviceid "$DEV1" +lvremove -y $vg +vgremove $vg +rm $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/serial cleanup_sysfs +rm $DF +aux wipefs_a "$DEV1" +mkdir -p $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device +echo -n " t10.123 456 " > $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid +lvmdevices --adddev "$DEV1" +cat $DF +grep "IDNAME=t10.123_456 DEVNAME" $DF +vgcreate $vg "$DEV1" +PVID1=`pvs "$DEV1" --noheading -o uuid | tr -d - | awk '{print $1}'` +cat $DF | grep -v IDNAME > $DFTMP +cat $DFTMP +echo "IDTYPE=sys_wwid IDNAME=__t10.123__456__ DEVNAME=${DEV1} PVID=${PVID1}" >> $DFTMP +cp $DFTMP $DF +cat $DF +vgs +pvs -o+deviceidtype,deviceid "$DEV1" +lvremove -y $vg +vgremove $vg +rm $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid +cleanup_sysfs + +rm $DF +aux wipefs_a "$DEV1" +mkdir -p $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device +echo -n " naa.123 456 " > $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid +lvmdevices --adddev "$DEV1" +cat $DF +grep "IDNAME=naa.123__456 DEVNAME" $DF +vgcreate $vg "$DEV1" +PVID1=`pvs "$DEV1" --noheading -o uuid | tr -d - | awk '{print $1}'` +cat $DF | grep -v IDNAME > $DFTMP +cat $DFTMP +echo "IDTYPE=sys_wwid IDNAME=__naa.123__456__ DEVNAME=${DEV1} PVID=${PVID1}" >> $DFTMP +cp $DFTMP $DF +cat $DF +vgs +pvs -o+deviceidtype,deviceid "$DEV1" +lvremove -y $vg +vgremove $vg +rm $SYS_DIR/dev/block/$MAJOR1:$MINOR1/device/wwid +cleanup_sysfs + + + # TODO: lvmdevices --adddev <dev> --deviceidtype <type> --deviceid <val> # This would let the user specify the second naa wwid.

1 0

main - tests: Skip integrity tests if target not present
by Marian Csontos 14 Jun '23

14 Jun '23

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f0b48a23d9d8b5d858be1… Commit: f0b48a23d9d8b5d858be1772ea5c9083d235b3b3 Parent: 4cf005d3959fdee5f78948164f22a0f0aff25173 Author: Marian Csontos <mcsontos(a)redhat.com> AuthorDate: Wed Jun 14 13:48:51 2023 +0200 Committer: Marian Csontos <mcsontos(a)redhat.com> CommitterDate: Wed Jun 14 13:48:51 2023 +0200 tests: Skip integrity tests if target not present --- test/shell/snapshot-raid.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/shell/snapshot-raid.sh b/test/shell/snapshot-raid.sh index 757bf911e..7b045d79e 100644 --- a/test/shell/snapshot-raid.sh +++ b/test/shell/snapshot-raid.sh @@ -348,6 +348,9 @@ test_extend_snap test_fill_snap lvremove -y $vg/$lv1 +# INTEGRITY TESTS FOLLOWING: +if aux have_integrity 1 5 0; then + lvcreate --type raid1 -m1 --raidintegrity y -n $lv1 -L128M $vg "$dev1" "$dev2" _wait_sync $vg/${lv1}_rimage_0 _wait_sync $vg/${lv1}_rimage_1 @@ -437,5 +440,7 @@ umount "$mount_dir" lvremove -y $vg/snap lvremove -y $vg/$lv1 +fi # INTEGRITY TESTS SKIPPED + vgremove -ff $vg

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits June 2023