August 2019 - lvm2-commits - Fedora Mailing-Lists

master - Revert "config: cache_policy should be cfg_runtime"

by David Teigland

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=bec3088f85a9a2d0b6a... Commit: bec3088f85a9a2d0b6a355aea1adc67fab8de6e9 Parent: 29eee32ac2fb3879eea04a8499219106411b4a37 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Wed Aug 7 11:35:45 2019 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Aug 7 11:35:45 2019 -0500 Revert "config: cache_policy should be cfg_runtime" This reverts commit 29eee32ac2fb3879eea04a8499219106411b4a37. Some other changes are needed to make this runtime. --- lib/config/config_settings.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index 7034759..2bb72ba 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -596,7 +596,7 @@ cfg(allocation_cache_mode_CFG, "cache_mode", allocation_CFG_SECTION, CFG_PROFILA "#\n" "This setting replaces allocation/cache_pool_cachemode.\n") -cfg_runtime(allocation_cache_policy_CFG, "cache_policy", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, 0, vsn(2, 2, 128), NULL, 0, NULL, +cfg(allocation_cache_policy_CFG, "cache_policy", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, 0, vsn(2, 2, 128), NULL, 0, NULL, "The default cache policy used for new cache volume.\n" "Since kernel 4.2 the default policy is smq (Stochastic multiqueue),\n" "otherwise the older mq (Multiqueue) policy is selected.\n")

4 years, 8 months

1
0
0 / 0

master - config: cache_policy should be cfg_runtime

by David Teigland

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=29eee32ac2fb3879eea... Commit: 29eee32ac2fb3879eea04a8499219106411b4a37 Parent: 682b6216dfa49444145df2e21d3aab1edf584d20 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Aug 5 13:44:37 2019 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Aug 7 11:08:15 2019 -0500 config: cache_policy should be cfg_runtime --- lib/config/config_settings.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index 2bb72ba..7034759 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -596,7 +596,7 @@ cfg(allocation_cache_mode_CFG, "cache_mode", allocation_CFG_SECTION, CFG_PROFILA "#\n" "This setting replaces allocation/cache_pool_cachemode.\n") -cfg(allocation_cache_policy_CFG, "cache_policy", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, 0, vsn(2, 2, 128), NULL, 0, NULL, +cfg_runtime(allocation_cache_policy_CFG, "cache_policy", allocation_CFG_SECTION, CFG_PROFILABLE | CFG_PROFILABLE_METADATA | CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, 0, vsn(2, 2, 128), NULL, 0, NULL, "The default cache policy used for new cache volume.\n" "Since kernel 4.2 the default policy is smq (Stochastic multiqueue),\n" "otherwise the older mq (Multiqueue) policy is selected.\n")

4 years, 8 months

1
0
0 / 0

master - config: set deprecated version for segment_libraries

by David Teigland

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=682b6216dfa49444145... Commit: 682b6216dfa49444145df2e21d3aab1edf584d20 Parent: 3a0d493d918510d863ddbdbc63d8a8ccb6ca2dd9 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Mon Aug 5 13:31:59 2019 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Wed Aug 7 11:08:11 2019 -0500 config: set deprecated version for segment_libraries Stopped being used some time ago. --- lib/config/config_settings.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index edfe4a3..2bb72ba 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -948,7 +948,7 @@ cfg(global_format_CFG, "format", global_CFG_SECTION, CFG_DEFAULT_COMMENTED, CFG_ cfg_array(global_format_libraries_CFG, "format_libraries", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 0), NULL, vsn(2, 3, 0), NULL, "This setting is no longer used.") -cfg_array(global_segment_libraries_CFG, "segment_libraries", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 18), NULL, 0, NULL, NULL) +cfg_array(global_segment_libraries_CFG, "segment_libraries", global_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(1, 0, 18), NULL, vsn(2, 3, 3), NULL, NULL) cfg(global_proc_CFG, "proc", global_CFG_SECTION, CFG_ADVANCED, CFG_TYPE_STRING, DEFAULT_PROC_DIR, vsn(1, 0, 0), NULL, 0, NULL, "Location of proc filesystem.\n")

4 years, 8 months

1
0
0 / 0

stable-2.02 - dev

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=d2debf88bf811cd6988... Commit: d2debf88bf811cd6988ee2aaa1a6925543ab4a92 Parent: 4a3e1ac7407dff9e53c5efea179a5620ad13f8f3 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Aug 7 15:22:43 2019 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Aug 7 15:28:57 2019 +0200 dev --- test/shell/lvmetad-disabled.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/test/shell/lvmetad-disabled.sh b/test/shell/lvmetad-disabled.sh index 84d7b54..7070e1c 100644 --- a/test/shell/lvmetad-disabled.sh +++ b/test/shell/lvmetad-disabled.sh @@ -60,7 +60,10 @@ not grep "WARNING: Not using lvmetad" out # because we know one side effect is to disable lvmetad. # FIXME: we should install lvmetactl so that we can # use that to directly disable lvmetad for tests like this. -not lvconvert --repair $vg1/$lv1 2>&1 | tee out +lvs -a $vg1 +#lvcreate -l1 -m1 --alloc anywhere -n $lv2 $vg1 +lvcreate -an -T -l1 $vg1/$lv2 +not lvconvert --repair $vg1/$lv2 2>&1 | tee out grep "WARNING: Disabling lvmetad cache" out pvs -vvvv 2>&1 | tee out

4 years, 8 months

1
0
0 / 0

stable-2.02 - exported_symbols: comment old symbols

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=4a3e1ac7407dff9e53c... Commit: 4a3e1ac7407dff9e53c5efea179a5620ad13f8f3 Parent: f39141ebc1aa7f4eda302530ccf866e6954dd077 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jul 30 15:31:51 2019 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Aug 7 15:28:55 2019 +0200 exported_symbols: comment old symbols Fix versioning for updated symbols dm_stats_create_region and dm_stats_create_region. Only the latest symbol should have global entry. Since I'm not sure what is currenlty the best option for old symbols - we added support for easy commenting of them (so we do not lose information when the symbol appeared for the first time.) Note: some old already deleted symbols should have been restored as comments. --- WHATS_NEW_DM | 1 + libdm/.exported_symbols.DM_1_02_106 | 2 +- libdm/.exported_symbols.DM_1_02_129 | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 8c78724..718d174 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.160 - ================================ + Fix versioning of dm_stats_create_region and dm_stats_create_region. Parsing of cache status understand no_discard_passdown. Version 1.02.158 - 13th May 2019 diff --git a/libdm/.exported_symbols.DM_1_02_106 b/libdm/.exported_symbols.DM_1_02_106 index 0bec544..88bba02 100644 --- a/libdm/.exported_symbols.DM_1_02_106 +++ b/libdm/.exported_symbols.DM_1_02_106 @@ -1,5 +1,5 @@ dm_message_supports_precise_timestamps -dm_stats_create_region +#dm_stats_create_region dm_stats_driver_supports_precise dm_stats_get_current_region_precise_timestamps dm_stats_get_region_precise_timestamps diff --git a/libdm/.exported_symbols.DM_1_02_129 b/libdm/.exported_symbols.DM_1_02_129 index 88d3f1b..a5133dd 100644 --- a/libdm/.exported_symbols.DM_1_02_129 +++ b/libdm/.exported_symbols.DM_1_02_129 @@ -1,4 +1,4 @@ -dm_bitset_parse_list +#dm_bitset_parse_list dm_stats_create_group dm_stats_current_object_type dm_stats_delete_group

4 years, 8 months

1
0
0 / 0

stable-2.02 - make: support comments in exported symbols

by Zdenek Kabelac

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=f39141ebc1aa7f4eda3... Commit: f39141ebc1aa7f4eda302530ccf866e6954dd077 Parent: 5ddd1ead2dcaf9594a025a15986b8bac573c81b2 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Jul 30 15:31:01 2019 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Aug 7 15:27:25 2019 +0200 make: support comments in exported symbols Now the lines starting with '#' in exported symbols files are treated as comments (ignored). --- make.tmpl.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/make.tmpl.in b/make.tmpl.in index 9d5d367..c8e4f14 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -557,17 +557,17 @@ EXPORTED_SYMBOLS := $(wildcard $(srcdir)/.exported_symbols.Base $(srcdir)/.expor .export.sym: .exported_symbols_generated $(EXPORTED_SYMBOLS) ifeq (,$(firstword $(EXPORTED_SYMBOLS))) $(Q) set -e; (echo "Base {"; echo " global:";\ - $(SED) "s/^/ /;s/$$/;/" $<;\ + $(SED) "/^#/d;s/^/ /;s/$$/;/" $<;\ echo "};";\ echo "Local {"; echo " local:"; echo " *;"; echo "};";\ ) > $@ else $(Q) set -e;\ - R=$$($(SORT) $^ | uniq -u);\ + R=$$($(SORT) $^ | $(GREP) -v "^#" | uniq -u);\ test -z "$$R" || { echo "Mismatch between symbols in shared library and lists in .exported_symbols.* files: $$R"; false; } ;\ ( for i in $$(echo $(EXPORTED_SYMBOLS) | tr ' ' '\n' | $(SORT) -rnt_ -k5 ); do\ echo "$${i##*.} {"; echo " global:";\ - $(SED) "s/^/ /;s/$$/;/" $$i;\ + $(SED) "/^#/d;s/^/ /;s/$$/;/" $$i;\ echo "};";\ done;\ echo "Local {"; echo " local:"; echo " *;"; echo "};";\

4 years, 8 months

1
0
0 / 0

master - WHATS_NEW: vgcreate/vgextend logical block size

by David Teigland

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=3a0d493d918510d863d... Commit: 3a0d493d918510d863ddbdbc63d8a8ccb6ca2dd9 Parent: cd8a0133fa28a0dff2714c80f822e8c665fe6237 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Aug 1 10:15:27 2019 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Aug 1 10:15:27 2019 -0500 WHATS_NEW: vgcreate/vgextend logical block size --- WHATS_NEW | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index cb693de..a7ccd39 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.03.06 - ================================ + Prevent creating VGs with PVs with different logical block sizes. Fix metadata writes from corrupting with large physical block size. Version 2.03.05 - 15th June 2019

4 years, 8 months

1
0
0 / 0

master - tests: allow-mixed-block-sizes

by David Teigland

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=cd8a0133fa28a0dff27... Commit: cd8a0133fa28a0dff2714c80f822e8c665fe6237 Parent: 0404539edb25e4a9d3456bb3e6b402aa2767af6b Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Aug 1 10:13:41 2019 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Aug 1 10:13:41 2019 -0500 tests: allow-mixed-block-sizes --- test/shell/allow-mixed-block-sizes.sh | 44 +++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/test/shell/allow-mixed-block-sizes.sh b/test/shell/allow-mixed-block-sizes.sh new file mode 100644 index 0000000..1803256 --- /dev/null +++ b/test/shell/allow-mixed-block-sizes.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +# Copyright (C) 2019 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing to use, +# modify, copy, or redistribute it subject to the terms and conditions +# of the GNU General Public License v.2. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +SKIP_WITH_LVMPOLLD=1 + +. lib/inittest + +dd if=/dev/zero of=loopa bs=$((1024*1024)) count=2 2> /dev/null +dd if=/dev/zero of=loopb bs=$((1024*1024)) count=2 2> /dev/null +LOOP1=$(losetup -f loopa --sector-size 4096 --show) +LOOP2=$(losetup -f loopb --show) + +echo $LOOP1 +echo $LOOP2 + +aux extend_filter "a|$LOOP1|" +aux extend_filter "a|$LOOP2|" + +not vgcreate --config 'devices {allow_mixed_block_sizes=0 scan="/dev"}' $vg $LOOP1 $LOOP2 +vgcreate --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg $LOOP1 $LOOP2 +vgs --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg + +wipefs -a $LOOP1 +wipefs -a $LOOP2 + +vgcreate --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg $LOOP1 +vgs --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg +not vgextend --config 'devices {allow_mixed_block_sizes=0 scan="/dev"}' $vg $LOOP2 +vgextend --config 'devices {allow_mixed_block_sizes=1 scan="/dev"}' $vg $LOOP2 + +losetup -d $LOOP1 +losetup -d $LOOP2 +rm loopa +rm loopb +

4 years, 8 months

1
0
0 / 0

master - vgcreate/vgextend: restrict PVs with mixed block sizes

by David Teigland

Gitweb: https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=0404539edb25e4a9d34... Commit: 0404539edb25e4a9d3456bb3e6b402aa2767af6b Parent: c1996c78c18ee0b555e4f7eba16858d8dd4fa0a1 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Aug 1 10:06:47 2019 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Aug 1 10:06:47 2019 -0500 vgcreate/vgextend: restrict PVs with mixed block sizes Avoid having PVs with different logical block sizes in the same VG. This prevents LVs from having mixed block sizes, which can produce file system errors. The new config setting devices/allow_mixed_block_sizes (default 0) can be changed to 1 to return to the unrestricted mode. --- lib/commands/toolcontext.h | 1 + lib/config/config_settings.h | 5 ++++ lib/metadata/metadata-exported.h | 1 + lib/metadata/metadata.c | 44 +++++++++++++++++++++++++++++++++++ tools/lvmcmdline.c | 2 + tools/toollib.c | 47 ++++++++++++++++++++++++++++++++++++++ tools/vgcreate.c | 2 + 7 files changed, 102 insertions(+), 0 deletions(-) diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h index 488752c..655d9f2 100644 --- a/lib/commands/toolcontext.h +++ b/lib/commands/toolcontext.h @@ -153,6 +153,7 @@ struct cmd_context { unsigned include_shared_vgs:1; /* report/display cmds can reveal lockd VGs */ unsigned include_active_foreign_vgs:1; /* cmd should process foreign VGs with active LVs */ unsigned vg_read_print_access_error:1; /* print access errors from vg_read */ + unsigned allow_mixed_block_sizes:1; unsigned force_access_clustered:1; unsigned lockd_gl_disable:1; unsigned lockd_vg_disable:1; diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h index 527d5bd..edfe4a3 100644 --- a/lib/config/config_settings.h +++ b/lib/config/config_settings.h @@ -502,6 +502,11 @@ cfg(devices_allow_changes_with_duplicate_pvs_CFG, "allow_changes_with_duplicate_ "Enabling this setting allows the VG to be used as usual even with\n" "uncertain devices.\n") +cfg(devices_allow_mixed_block_sizes_CFG, "allow_mixed_block_sizes", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 3, 6), NULL, 0, NULL, + "Allow PVs in the same VG with different logical block sizes.\n" + "When allowed, the user is responsible to ensure that an LV is\n" + "using PVs with matching block sizes when necessary.\n") + cfg_array(allocation_cling_tag_list_CFG, "cling_tag_list", allocation_CFG_SECTION, CFG_DEFAULT_UNDEFINED, CFG_TYPE_STRING, NULL, vsn(2, 2, 77), NULL, 0, NULL, "Advise LVM which PVs to use when searching for new space.\n" "When searching for free space to extend an LV, the 'cling' allocation\n" diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index f18587a..e1767b7 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -623,6 +623,7 @@ struct pvcreate_params { unsigned is_remove : 1; /* is removing PVs, not creating */ unsigned preserve_existing : 1; unsigned check_failed : 1; + unsigned check_consistent_block_size : 1; }; struct lvresize_params { diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index f19df3d..e55adc2 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -751,12 +751,40 @@ int vg_extend_each_pv(struct volume_group *vg, struct pvcreate_params *pp) { struct pv_list *pvl; unsigned int max_phys_block_size = 0; + unsigned int physical_block_size, logical_block_size; + unsigned int prev_lbs = 0; + int inconsistent_existing_lbs = 0; log_debug_metadata("Adding PVs to VG %s.", vg->name); if (vg_bad_status_bits(vg, RESIZEABLE_VG)) return_0; + /* + * Check if existing PVs have inconsistent block sizes. + * If so, do not enforce new devices to be consistent. + */ + dm_list_iterate_items(pvl, &vg->pvs) { + logical_block_size = 0; + physical_block_size = 0; + + if (!dev_get_direct_block_sizes(pvl->pv->dev, &physical_block_size, &logical_block_size)) + continue; + + if (!logical_block_size) + continue; + + if (!prev_lbs) { + prev_lbs = logical_block_size; + continue; + } + + if (prev_lbs != logical_block_size) { + inconsistent_existing_lbs = 1; + break; + } + } + dm_list_iterate_items(pvl, &pp->pvs) { log_debug_metadata("Adding PV %s to VG %s.", pv_dev_name(pvl->pv), vg->name); @@ -767,6 +795,22 @@ int vg_extend_each_pv(struct volume_group *vg, struct pvcreate_params *pp) return 0; } + logical_block_size = 0; + physical_block_size = 0; + + if (!dev_get_direct_block_sizes(pvl->pv->dev, &physical_block_size, &logical_block_size)) + log_warn("WARNING: PV %s has unknown block size.", pv_dev_name(pvl->pv)); + + else if (prev_lbs && logical_block_size && (logical_block_size != prev_lbs)) { + if (vg->cmd->allow_mixed_block_sizes || inconsistent_existing_lbs) + log_debug("Devices have inconsistent block sizes (%u and %u)", prev_lbs, logical_block_size); + else { + log_error("Devices have inconsistent logical block sizes (%u and %u).", + prev_lbs, logical_block_size); + return 0; + } + } + if (!add_pv_to_vg(vg, pv_dev_name(pvl->pv), pvl->pv, 0)) { log_error("PV %s cannot be added to VG %s.", pv_dev_name(pvl->pv), vg->name); diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 30f9d81..7d29b6f 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -2319,6 +2319,8 @@ static int _get_current_settings(struct cmd_context *cmd) cmd->scan_lvs = find_config_tree_bool(cmd, devices_scan_lvs_CFG, NULL); + cmd->allow_mixed_block_sizes = find_config_tree_bool(cmd, devices_allow_mixed_block_sizes_CFG, NULL); + /* * enable_hints is set to 1 if any commands are using hints. * use_hints is set to 1 if this command doesn't use the hints. diff --git a/tools/toollib.c b/tools/toollib.c index b2313f8..155528c 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -5355,6 +5355,8 @@ int pvcreate_each_device(struct cmd_context *cmd, struct pv_list *vgpvl; struct device_list *devl; const char *pv_name; + unsigned int physical_block_size, logical_block_size; + unsigned int prev_pbs = 0, prev_lbs = 0; int must_use_all = (cmd->cname->flags & MUST_USE_ALL_ARGS); int found; unsigned i; @@ -5395,6 +5397,51 @@ int pvcreate_each_device(struct cmd_context *cmd, pd->dev = dev_cache_get(cmd, pd->name, cmd->filter); /* + * Check for consistent block sizes. + */ + if (pp->check_consistent_block_size) { + dm_list_iterate_items(pd, &pp->arg_devices) { + if (!pd->dev) + continue; + + logical_block_size = 0; + physical_block_size = 0; + + if (!dev_get_direct_block_sizes(pd->dev, &physical_block_size, &logical_block_size)) { + log_warn("WARNING: Unknown block size for device %s.", dev_name(pd->dev)); + continue; + } + + if (!logical_block_size) { + log_warn("WARNING: Unknown logical_block_size for device %s.", dev_name(pd->dev)); + continue; + } + + if (!prev_lbs) { + prev_lbs = logical_block_size; + prev_pbs = physical_block_size; + continue; + } + + if (prev_lbs == logical_block_size) { + /* Require lbs to match, just warn about unmatching pbs. */ + if (!cmd->allow_mixed_block_sizes && prev_pbs && physical_block_size && + (prev_pbs != physical_block_size)) + log_warn("WARNING: Devices have inconsistent physical block sizes (%u and %u).", + prev_pbs, physical_block_size); + continue; + } + + if (!cmd->allow_mixed_block_sizes) { + log_error("Devices have inconsistent logical block sizes (%u and %u).", + prev_lbs, logical_block_size); + log_print("See lvm.conf allow_mixed_block_sizes."); + return 0; + } + } + } + + /* * Use process_each_pv to search all existing PVs and devices. * * This is a slightly different way to use process_each_pv, because the diff --git a/tools/vgcreate.c b/tools/vgcreate.c index d594ec1..09b6a6c 100644 --- a/tools/vgcreate.c +++ b/tools/vgcreate.c @@ -47,6 +47,8 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv) /* Don't create a new PV on top of an existing PV like pvcreate does. */ pp.preserve_existing = 1; + pp.check_consistent_block_size = 1; + if (!vgcreate_params_set_defaults(cmd, &vp_def, NULL)) return EINVALID_CMD_LINE; vp_def.vg_name = vg_name;

4 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits August 2019