lvm2-commits November 2012

lvm2-commits@lists.fedorahosted.org

6 participants
39 discussions

master - man page (lvcreate): Better explain stripes option for RAID 4/5/6.
by Jonathan Brassow 01 Dec '12

01 Dec '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=83978cdec8aa6f6b… Commit: 83978cdec8aa6f6b6af2cb8937d64cc16b88cf18 Parent: ed9751d9fa6638e0cae5aa38727f971eeac6516c Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Fri Nov 30 16:47:02 2012 -0600 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Fri Nov 30 16:47:02 2012 -0600 man page (lvcreate): Better explain stripes option for RAID 4/5/6. Do a better job explaining the '--stripes/-i' option to lvcreate when it comes to RAID 4/5/6. The extra devices needed for parity are implicitly added to the argument given. So a 5-device RAID6 logical volume is created with '-i 3' - indicating 3 stripes plus the implicit 2 devices needed for RAID6. --- man/lvcreate.8.in | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/man/lvcreate.8.in b/man/lvcreate.8.in index 705ebae..da4c1fe 100644 --- a/man/lvcreate.8.in +++ b/man/lvcreate.8.in @@ -150,7 +150,11 @@ Default is \fIpassdown\fP. .BR \-i ", " \-\-stripes " " \fIStripes Gives the number of stripes. This is equal to the number of physical volumes to scatter -the logical volume. +the logical volume. When creating a RAID 4/5/6 logical volume, +the extra devices which are necessary for parity are +internally accounted for. Specifying '\-i 3' would use 3 devices +for striped logical volumes, 4 devices for RAID 4/5, and 5 devices +for RAID 6. .TP .BR \-I ", " \-\-stripesize " " \fIStripeSize Gives the number of kilobytes for the granularity of the stripes.

1 0

master - udev: add a warning message if DM_DISABLE_UDEV set and udev running
by Peter Rajnoha 30 Nov '12

30 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ed9751d9fa6638e0… Commit: ed9751d9fa6638e0cae5aa38727f971eeac6516c Parent: b13d45d21d616c5512593617bbf5ed4c623805ed Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Nov 29 15:50:52 2012 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Thu Nov 29 15:57:43 2012 +0100 udev: add a warning message if DM_DISABLE_UDEV set and udev running $ export DM_DISABLE_UDEV=1 $ dmsetup create test --table "0 1 zero" Udev is running and DM_DISABLE_UDEV environment variable is set. Bypassing udev, device-mapper library will manage device nodes in device directory. $ lvchange -ay vg/lvol0 Udev is running and DM_DISABLE_UDEV environment variable is set. Bypassing udev, LVM will manage logical volume symlinks in device directory. Udev is running and DM_DISABLE_UDEV environment variable is set. Bypassing udev, LVM will obtain device list by scanning device directory. Udev is running and DM_DISABLE_UDEV environment variable is set. Bypassing udev, device-mapper library will manage device nodes in device directory. --- lib/commands/toolcontext.c | 29 ++++++++++++++++++----------- libdm/libdm-common.c | 14 ++++++++------ 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 57ce1fe..14152b7 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -211,6 +211,21 @@ static void _init_logging(struct cmd_context *cmd) reset_lvm_errno(1); } +static int _check_disable_udev(const char *msg) { + if (getenv("DM_DISABLE_UDEV")) { + log_very_verbose("DM_DISABLE_UDEV environment variable set. " + "Overriding configuration to use " + "udev_rules=0, udev_sync=0, verify_udev_operations=1."); + if (udev_is_running()) + log_warn("Udev is running and DM_DISABLE_UDEV environment variable is set. " + "Bypassing udev, LVM will %s.", msg); + + return 1; + } + + return 0; +} + #ifdef UDEV_SYNC_SUPPORT /* * Until the DM_UEVENT_GENERATED_FLAG was introduced in kernel patch @@ -318,12 +333,7 @@ static int _process_config(struct cmd_context *cmd) * - udev_sync = 0 * - udev_fallback = 1 */ - if (getenv("DM_DISABLE_UDEV")) { - log_very_verbose("DM_DISABLE_UDEV environment variable set. " - "Overriding configuration to use " - "udev_rules=0, udev_sync=0, verify_udev_operations=1."); - udev_disabled = 1; - } + udev_disabled = _check_disable_udev("manage logical volume symlinks in device directory"); cmd->default_settings.udev_rules = udev_disabled ? 0 : find_config_tree_int(cmd, "activation/udev_rules", DEFAULT_UDEV_RULES); @@ -709,12 +719,9 @@ static int _init_dev_cache(struct cmd_context *cmd) * - udev is not running * - udev is disabled using DM_DISABLE_UDEV environment variable */ - if (getenv("DM_DISABLE_UDEV")) { - log_very_verbose("DM_DISABLE_UDEV environment variable set. " - "Overriding configuration to use " - "device_list_from_udev=0"); + if (_check_disable_udev("obtain device list by scanning device directory")) device_list_from_udev = 0; - } else + else device_list_from_udev = udev_is_running() ? find_config_tree_bool(cmd, "devices/obtain_device_list_from_udev", DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV) : 0; diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index 527124f..075fba8 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -1933,8 +1933,13 @@ static void _check_udev_sync_requirements_once(void) if (_semaphore_supported < 0) _semaphore_supported = _check_semaphore_is_supported(); - if (_udev_running < 0) + if (_udev_running < 0) { _udev_running = _check_udev_is_running(); + if (_udev_disabled && _udev_running) + log_warn("Udev is running and DM_DISABLE_UDEV environment variable is set. " + "Bypassing udev, device-mapper library will manage device " + "nodes in device directory."); + } } void dm_udev_set_sync_support(int sync_with_udev) @@ -1945,13 +1950,10 @@ void dm_udev_set_sync_support(int sync_with_udev) int dm_udev_get_sync_support(void) { - if (_udev_disabled) - return 0; - _check_udev_sync_requirements_once(); - return _semaphore_supported && dm_cookie_supported() && - _udev_running && _sync_with_udev; + return !_udev_disabled && _semaphore_supported && + dm_cookie_supported() &&_udev_running && _sync_with_udev; } void dm_udev_set_checking(int checking)

1 0

master - udev: _udev_disabled var visible also for !UDEV_SYNC_SUPPORT
by Peter Rajnoha 30 Nov '12

30 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b13d45d21d616c55… Commit: b13d45d21d616c5512593617bbf5ed4c623805ed Parent: 4891a735d343db26460f1b6218169c458d59f2a1 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Nov 29 14:40:12 2012 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Thu Nov 29 14:40:12 2012 +0100 udev: _udev_disabled var visible also for !UDEV_SYNC_SUPPORT --- libdm/libdm-common.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index 2d79efa..527124f 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -74,8 +74,9 @@ static dm_string_mangling_t _name_mangling_mode = DEFAULT_DM_NAME_MANGLING; static struct selabel_handle *_selabel_handle = NULL; #endif -#ifdef UDEV_SYNC_SUPPORT static int _udev_disabled = 0; + +#ifdef UDEV_SYNC_SUPPORT static int _semaphore_supported = -1; static int _udev_running = -1; static int _sync_with_udev = 1;

1 0

master - udev: recognize DM_DISABLE_UDEV environment variable
by Peter Rajnoha 30 Nov '12

30 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4891a735d343db26… Commit: 4891a735d343db26460f1b6218169c458d59f2a1 Parent: fb8cc7c63f7f5ab9e0d6d2d38f29169346a54087 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Nov 29 14:03:48 2012 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Thu Nov 29 14:03:48 2012 +0100 udev: recognize DM_DISABLE_UDEV environment variable Setting this environment variable will cause a full fallback to old direct node and symlink management in libdevmapper and lvm2. It means: - disabling udev synchronization (--noudevsync in dmsetup and --noudevsync + activation/udev_sync=0 lvm2 config) - disabling dm and any subsystem related udev rules (--noudevrules in dmsetup and activation/udev_rules=0 lvm2 config) - management of nodes/symlinks under /dev directly by libdevmapper/lvm2 (--verifyudev in dmsetup and activation/verify_udev_operations=1 lvm2 config) - not obtaining any device list from udev database (devices/obtain_device_list_from_udev=0 lvm2 config) Note: we could set all of these before - there's no functional change! However the DM_DISABLE_UDEV environment variable is a nice shortcut to make it easier for libdevmapper users so that one can switch off all of the udev management off at one go directly on the command line, without a need to modify any source or add any extra switches. --- WHATS_NEW | 1 + WHATS_NEW_DM | 1 + lib/commands/toolcontext.c | 55 +++++++++++++++++++++++++++++++------------ libdm/libdm-common.c | 34 ++++++++++++++++++++++++--- 4 files changed, 71 insertions(+), 20 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 657b3a4..ca1b539 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.99 - =================================== + Recognize DM_DISABLE_UDEV environment variable for a complete fallback. Do not verify udev operations if --noudevsync command option is used. Fix lvm2api and return lvseg discards property as string. Allow forced vgcfgrestore of lvm2 metadata with thin volumes. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 3f8d9c9..3ea0502 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.78 - =================================== + Add DM_DISABLE_UDEV environment variable to manage dev nodes by libdm only. Fix dm_task_set_cookie to properly process udev flags if udev_sync disabled. Version 1.02.77 - 15th October 2012 diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index aec4df3..57ce1fe 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -237,6 +237,7 @@ static int _process_config(struct cmd_context *cmd) const struct dm_config_value *cv; int64_t pv_min_kb; const char *lvmetad_socket; + int udev_disabled = 0; /* umask */ cmd->default_settings.umask = find_config_tree_int(cmd, @@ -310,13 +311,25 @@ static int _process_config(struct cmd_context *cmd) return 0; } - cmd->default_settings.udev_rules = find_config_tree_int(cmd, - "activation/udev_rules", - DEFAULT_UDEV_RULES); + /* + * If udev is disabled using DM_DISABLE_UDEV environment + * variable, override existing config and hardcode these: + * - udev_rules = 0 + * - udev_sync = 0 + * - udev_fallback = 1 + */ + if (getenv("DM_DISABLE_UDEV")) { + log_very_verbose("DM_DISABLE_UDEV environment variable set. " + "Overriding configuration to use " + "udev_rules=0, udev_sync=0, verify_udev_operations=1."); + udev_disabled = 1; + } + + cmd->default_settings.udev_rules = udev_disabled ? 0 : + find_config_tree_int(cmd, "activation/udev_rules", DEFAULT_UDEV_RULES); - cmd->default_settings.udev_sync = find_config_tree_int(cmd, - "activation/udev_sync", - DEFAULT_UDEV_SYNC); + cmd->default_settings.udev_sync = udev_disabled ? 0 : + find_config_tree_int(cmd, "activation/udev_sync", DEFAULT_UDEV_SYNC); init_retry_deactivation(find_config_tree_int(cmd, "activation/retry_deactivation", DEFAULT_RETRY_DEACTIVATION)); @@ -326,14 +339,12 @@ static int _process_config(struct cmd_context *cmd) #ifdef UDEV_SYNC_SUPPORT /* - * We need udev rules to be applied, otherwise we would end up with no - * nodes and symlinks! However, we can disable the synchronization itself - * in runtime and still have only udev to create the nodes and symlinks - * without any fallback. + * Use udev fallback automatically in case udev + * is disabled via DM_DISABLE_UDEV environment + * variable or udev rules are switched off. */ - cmd->default_settings.udev_fallback = cmd->default_settings.udev_rules ? - find_config_tree_int(cmd, "activation/verify_udev_operations", - DEFAULT_VERIFY_UDEV_OPERATIONS) : 1; + cmd->default_settings.udev_fallback = !cmd->default_settings.udev_rules || udev_disabled ? 1 : + find_config_tree_int(cmd, "activation/verify_udev_operations", DEFAULT_VERIFY_UDEV_OPERATIONS); /* Do not rely fully on udev if the udev support is known to be incomplete. */ if (!cmd->default_settings.udev_fallback && !_dm_driver_has_stable_udev_support()) { @@ -693,9 +704,21 @@ static int _init_dev_cache(struct cmd_context *cmd) if (!dev_cache_init(cmd)) return_0; - device_list_from_udev = udev_is_running() ? - find_config_tree_bool(cmd, "devices/obtain_device_list_from_udev", - DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV) : 0; + /* + * Override existing config and hardcode device_list_from_udev = 0 if: + * - udev is not running + * - udev is disabled using DM_DISABLE_UDEV environment variable + */ + if (getenv("DM_DISABLE_UDEV")) { + log_very_verbose("DM_DISABLE_UDEV environment variable set. " + "Overriding configuration to use " + "device_list_from_udev=0"); + device_list_from_udev = 0; + } else + device_list_from_udev = udev_is_running() ? + find_config_tree_bool(cmd, "devices/obtain_device_list_from_udev", + DEFAULT_OBTAIN_DEVICE_LIST_FROM_UDEV) : 0; + init_obtain_device_list_from_udev(device_list_from_udev); if (!(cn = find_config_tree_node(cmd, "devices/scan"))) { diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index afdac89..2d79efa 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -75,6 +75,7 @@ static struct selabel_handle *_selabel_handle = NULL; #endif #ifdef UDEV_SYNC_SUPPORT +static int _udev_disabled = 0; static int _semaphore_supported = -1; static int _udev_running = -1; static int _sync_with_udev = 1; @@ -85,6 +86,9 @@ void dm_lib_init(void) { const char *env; + if ((env = getenv("DM_DISABLE_UDEV"))) + _udev_disabled = 1; + env = getenv(DM_DEFAULT_NAME_MANGLING_MODE_ENV_VAR_NAME); if (env && *env) { if (!strcasecmp(env, "none")) @@ -1814,6 +1818,26 @@ out: return r; } +static void _set_cookie_flags(struct dm_task *dmt, uint16_t flags) +{ + if (!dm_cookie_supported()) + return; + + if (_udev_disabled) { + /* + * If udev is disabled, hardcode this functionality: + * - we want libdm to create the nodes + * - we don't want the /dev/mapper and any subsystem + * related content to be created by udev if udev + * rules are installed + */ + flags &= ~DM_UDEV_DISABLE_LIBRARY_FALLBACK; + flags |= DM_UDEV_DISABLE_DM_RULES_FLAG | DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG; + } + + dmt->event_nr = flags << DM_UDEV_FLAGS_SHIFT; +} + #ifndef UDEV_SYNC_SUPPORT void dm_udev_set_sync_support(int sync_with_udev) { @@ -1835,8 +1859,8 @@ int dm_udev_get_checking(void) int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags) { - if (dm_cookie_supported()) - dmt->event_nr = flags << DM_UDEV_FLAGS_SHIFT; + _set_cookie_flags(dmt, flags); + *cookie = 0; dmt->cookie_set = 1; @@ -1920,6 +1944,9 @@ void dm_udev_set_sync_support(int sync_with_udev) int dm_udev_get_sync_support(void) { + if (_udev_disabled) + return 0; + _check_udev_sync_requirements_once(); return _semaphore_supported && dm_cookie_supported() && @@ -2203,8 +2230,7 @@ int dm_task_set_cookie(struct dm_task *dmt, uint32_t *cookie, uint16_t flags) { int semid; - if (dm_cookie_supported()) - dmt->event_nr = flags << DM_UDEV_FLAGS_SHIFT; + _set_cookie_flags(dmt, flags); if (!dm_udev_get_sync_support()) { *cookie = 0;

1 0

master - udev: do not verify udev operations for --noudevsync
by Peter Rajnoha 30 Nov '12

30 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=fb8cc7c63f7f5ab9… Commit: fb8cc7c63f7f5ab9e0d6d2d38f29169346a54087 Parent: 2be940e54910157da05ffe5d828828e4bcd8b25a Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Nov 29 13:59:12 2012 +0100 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Thu Nov 29 13:59:12 2012 +0100 udev: do not verify udev operations for --noudevsync If udev synchronization is disabled by means of --noudevsync option, we should disable just the synchronization and nothing else. The udev fallback (verifying udev operations and fixing the nodes/symlinks if found incorrect) is orthogonal and controlled by a separate activation/verify_udev_operations configuration option. --- WHATS_NEW | 1 + tools/lvmcmdline.c | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 98b5f9e..657b3a4 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.99 - =================================== + Do not verify udev operations if --noudevsync command option is used. Fix lvm2api and return lvseg discards property as string. Allow forced vgcfgrestore of lvm2 metadata with thin volumes. Recognise STEC skd devices in filter. diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 3720d7f..34d324f 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -901,10 +901,8 @@ static int _get_settings(struct cmd_context *cmd) } else init_trust_cache(0); - if (arg_count(cmd, noudevsync_ARG)) { + if (arg_count(cmd, noudevsync_ARG)) cmd->current_settings.udev_sync = 0; - cmd->current_settings.udev_fallback = 1; - } /* Handle synonyms */ if (!_merge_synonym(cmd, resizable_ARG, resizeable_ARG) ||

1 0

master - tests: update thin testing
by Zdenek Kabelac 28 Nov '12

28 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2be940e54910157d… Commit: 2be940e54910157da05ffe5d828828e4bcd8b25a Parent: 0387e70d7698be559d2d7ca8f9cdb8882be7ad0b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Nov 27 01:01:38 2012 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Nov 27 14:10:46 2012 +0100 tests: update thin testing --- test/shell/lvconvert-thin.sh | 10 ++++++++-- test/shell/thin-defaults.sh | 35 +++++++++++++++++++++++++++++++++++ test/shell/thin-restore.sh | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 2 deletions(-) diff --git a/test/shell/lvconvert-thin.sh b/test/shell/lvconvert-thin.sh index f21453f..4634aa2 100644 --- a/test/shell/lvconvert-thin.sh +++ b/test/shell/lvconvert-thin.sh @@ -24,9 +24,15 @@ prepare_lvs() # aux have_thin 1 0 0 || skip -aux prepare_pvs 4 6400000 +aux prepare_pvs 4 64 -vgcreate $vg -s 64K $(cat DEVICES) +# build one large PV +vgcreate $vg1 $(cut -d ' ' -f -3 DEVICES) +lvcreate -s -l 100%FREE -n $lv $vg1 --virtualsize 64T +aux lvmconf 'devices/filter = [ "a/dev\/mapper\/.*$/", "a/dev\/LVMTEST/", "r/.*/" ]' + +pvcreate "$DM_DEV_DIR/$vg1/$lv" +vgcreate $vg -s 64K $(cut -d ' ' -f 4 DEVICES) "$DM_DEV_DIR/$vg1/$lv" # create mirrored LVs for data and metadata volumes lvcreate -aey -L10M -m1 --mirrorlog core -n $lv1 $vg diff --git a/test/shell/thin-defaults.sh b/test/shell/thin-defaults.sh new file mode 100644 index 0000000..677d2f1 --- /dev/null +++ b/test/shell/thin-defaults.sh @@ -0,0 +1,35 @@ +#!/bin/bash +# Copyright (C) 2012 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# test defaults entered through lvm.conf + +. lib/test + +# +# Main +# +aux have_thin 1 0 0 || skip + +aux prepare_vg 2 + +lvcreate -T -L8M $vg/pool0 + +aux lvmconf "allocation/thin_pool_chunk_size = 128" \ + "allocation/thin_pool_discards = \"ignore\"" \ + "allocation/thin_pool_zero = 0" + +lvcreate -T -L8M $vg/pool1 + +check lv_field $vg/pool1 chunksize "128.00k" +check lv_field $vg/pool1 discards "ignore" +check lv_field $vg/pool1 zero 0 + +vgremove -f $vg diff --git a/test/shell/thin-restore.sh b/test/shell/thin-restore.sh new file mode 100644 index 0000000..7580ae4 --- /dev/null +++ b/test/shell/thin-restore.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# Copyright (C) 2012 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# test restore operation of thin pool metadata + +. lib/test + +# +# Main +# +aux have_thin 1 0 0 || skip + +aux prepare_vg 2 + +lvcreate -T -L8M $vg/pool -V10M -n $lv1 + +vgcfgbackup -f backup $vg + +# use of --force is mandatory +not vgcfgrestore -f backup $vg + +vgcfgrestore -f backup --force $vg + +check lv_field $vg/pool transaction_id 1 + +vgremove -f $vg

1 0

master - thin: fix property discard for lvm2api
by Zdenek Kabelac 28 Nov '12

28 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=0387e70d7698be55… Commit: 0387e70d7698be559d2d7ca8f9cdb8882be7ad0b Parent: 09b7ceea95edb2b54074cbd5d3b2009b5bf1dd4e Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Tue Nov 27 11:02:49 2012 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Nov 27 14:09:49 2012 +0100 thin: fix property discard for lvm2api Discards property is string and may have these values: ignore, nopassdown, passdown --- WHATS_NEW | 1 + lib/metadata/lv.c | 5 +++++ lib/metadata/lv.h | 1 + lib/report/columns.h | 2 +- lib/report/properties.c | 2 +- test/api/thin_percent.c | 10 ++++++++++ test/api/thin_percent.sh | 2 +- 7 files changed, 20 insertions(+), 3 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 1655a7e..98b5f9e 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.99 - =================================== + Fix lvm2api and return lvseg discards property as string. Allow forced vgcfgrestore of lvm2 metadata with thin volumes. Recognise STEC skd devices in filter. Recognise Violin Memory vtms devices in filter. diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index 4032f34..34b428a 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -123,6 +123,11 @@ char *lvseg_segtype_dup(struct dm_pool *mem, const struct lv_segment *seg) return dm_pool_strdup(mem, seg->segtype->ops->name(seg)); } +char *lvseg_discards_dup(struct dm_pool *mem, const struct lv_segment *seg) +{ + return dm_pool_strdup(mem, get_pool_discards_name(seg->discards)); +} + uint64_t lvseg_chunksize(const struct lv_segment *seg) { uint64_t size; diff --git a/lib/metadata/lv.h b/lib/metadata/lv.h index 0daab62..838b002 100644 --- a/lib/metadata/lv.h +++ b/lib/metadata/lv.h @@ -74,6 +74,7 @@ uint64_t lvseg_start(const struct lv_segment *seg); uint64_t lvseg_size(const struct lv_segment *seg); uint64_t lvseg_chunksize(const struct lv_segment *seg); char *lvseg_segtype_dup(struct dm_pool *mem, const struct lv_segment *seg); +char *lvseg_discards_dup(struct dm_pool *mem, const struct lv_segment *seg); char *lvseg_tags_dup(const struct lv_segment *seg); char *lvseg_devices(struct dm_pool *mem, const struct lv_segment *seg); char *lvseg_seg_pe_ranges(struct dm_pool *mem, const struct lv_segment *seg); diff --git a/lib/report/columns.h b/lib/report/columns.h index c83a086..87b22ae 100644 --- a/lib/report/columns.h +++ b/lib/report/columns.h @@ -141,7 +141,7 @@ FIELD(SEGS, seg, NUM, "Region", region_size, 6, size32, region_size, "For mirror FIELD(SEGS, seg, NUM, "Chunk", list, 5, chunksize, chunksize, "For snapshots, the unit of data used when tracking changes.", 0) FIELD(SEGS, seg, NUM, "Chunk", list, 5, chunksize, chunk_size, "For snapshots, the unit of data used when tracking changes.", 0) FIELD(SEGS, seg, NUM, "#Thins", list, 4, thincount, thin_count, "For thin pools, the number of thin volumes in this pool.", 0) -FIELD(SEGS, seg, NUM, "Discards", list, 8, discards, discards, "For thin pools, how discards are handled.", 0) +FIELD(SEGS, seg, STR, "Discards", list, 8, discards, discards, "For thin pools, how discards are handled.", 0) FIELD(SEGS, seg, NUM, "Zero", list, 4, thinzero, zero, "For thin pools, if zeroing is enabled.", 0) FIELD(SEGS, seg, NUM, "TransId", list, 4, transactionid, transaction_id, "For thin pools, the transaction id.", 0) FIELD(SEGS, seg, NUM, "Start", list, 5, segstart, seg_start, "Offset within the LV to the start of the segment in current units.", 0) diff --git a/lib/report/properties.c b/lib/report/properties.c index fe197f5..0cd39ba 100644 --- a/lib/report/properties.c +++ b/lib/report/properties.c @@ -287,7 +287,7 @@ GET_LVSEG_NUM_PROPERTY_FN(zero, lvseg->zero_new_blocks) #define _zero_set _not_implemented_set GET_LVSEG_NUM_PROPERTY_FN(transaction_id, lvseg->transaction_id) #define _transaction_id_set _not_implemented_set -GET_LVSEG_NUM_PROPERTY_FN(discards, lvseg->discards) +GET_LVSEG_STR_PROPERTY_FN(discards, lvseg_discards_dup(lvseg->lv->vg->vgmem, lvseg)) #define _discards_set _not_implemented_set GET_LVSEG_NUM_PROPERTY_FN(seg_start, lvseg_start(lvseg)) #define _seg_start_set _not_implemented_set diff --git a/test/api/thin_percent.c b/test/api/thin_percent.c index 2c8b19b..ae511df 100644 --- a/test/api/thin_percent.c +++ b/test/api/thin_percent.c @@ -23,6 +23,8 @@ int main(int argc, char *argv[]) vg_t vg; lv_t lv; struct lvm_property_value v; + struct dm_list *lvsegs; + struct lvm_lvseg_list *lvl; handle = lvm_init(NULL); assert(handle); @@ -33,6 +35,14 @@ int main(int argc, char *argv[]) lv = lvm_lv_from_name(vg, "pool"); assert(lv); + lvsegs = lvm_lv_list_lvsegs(lv); + assert(lvsegs && (dm_list_size(lvsegs) == 1)); + dm_list_iterate_items(lvl, lvsegs) { + v = lvm_lvseg_get_property(lvl->lvseg, "discards"); + assert(v.is_valid && v.is_string); + assert(strcmp(v.value.string, "passdown") == 0); + } + v = lvm_lv_get_property(lv, "data_percent"); assert(v.is_valid); assert(v.value.integer == 25 * PERCENT_1); diff --git a/test/api/thin_percent.sh b/test/api/thin_percent.sh index 9287cf3..e14e807 100644 --- a/test/api/thin_percent.sh +++ b/test/api/thin_percent.sh @@ -30,7 +30,7 @@ dd if=/dev/urandom of="$DM_DEV_DIR/$vg/thin" count=2 bs=256K lvcreate -s $vg/thin -n snap dd if=/dev/urandom of="$DM_DEV_DIR/$vg/snap" count=3 bs=256K -lvs $vg +lvs -o+discards $vg aux apitest thin_percent $vg

1 0

master - thin: allow restore with --force
by Zdenek Kabelac 28 Nov '12

28 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=09b7ceea95edb2b5… Commit: 09b7ceea95edb2b54074cbd5d3b2009b5bf1dd4e Parent: c7a7fd0a12d0daef70e3c4517ccdef6830c7a34e Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Nov 26 23:45:35 2012 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Nov 27 14:08:24 2012 +0100 thin: allow restore with --force Allow restoring metadata with thin pool volumes. No validation is done for this case within vgcfgrestore tool - thus incorrect metadata may lead to destruction of pool content. --- WHATS_NEW | 1 + lib/format_text/archiver.c | 24 +++++++++++++++--------- lib/format_text/archiver.h | 4 ++-- man/vgcfgrestore.8.in | 9 +++++++++ tools/args.h | 1 + tools/commands.h | 3 ++- tools/vgcfgrestore.c | 5 +++-- 7 files changed, 33 insertions(+), 14 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 2c6ad4c..1655a7e 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.99 - =================================== + Allow forced vgcfgrestore of lvm2 metadata with thin volumes. Recognise STEC skd devices in filter. Recognise Violin Memory vtms devices in filter. Add lvm.conf thin pool defs thin_pool_{chunk_size|discards|zero}. diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c index ccefb4c..8599e3b 100644 --- a/lib/format_text/archiver.c +++ b/lib/format_text/archiver.c @@ -347,7 +347,7 @@ int backup_restore_vg(struct cmd_context *cmd, struct volume_group *vg) /* ORPHAN and VG locks held before calling this */ int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name, - const char *file) + const char *file, int force) { struct volume_group *vg; int missing_pvs, r = 0; @@ -360,14 +360,20 @@ int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name, return_0; /* FIXME: Restore support is missing for now */ - dm_list_iterate_items(lvl, &vg->lvs) + dm_list_iterate_items(lvl, &vg->lvs) { if (lv_is_thin_type(lvl->lv)) { - log_error("Cannot restore Volume Group %s with " - "thin logical volumes. " - "(not yet supported).", vg->name); - r = 0; - goto out; + if (!force) { + log_error("Consider using option --force to restore " + "Volume Group %s with thin volumes.", + vg->name); + goto out; + } else { + log_warn("WARNING: Forced restore of Volume Group " + "%s with thin volumes.", vg->name); + break; + } } + } missing_pvs = vg_missing_pv_count(vg); if (missing_pvs == 0) @@ -381,7 +387,7 @@ out: return r; } -int backup_restore(struct cmd_context *cmd, const char *vg_name) +int backup_restore(struct cmd_context *cmd, const char *vg_name, int force) { char path[PATH_MAX]; @@ -391,7 +397,7 @@ int backup_restore(struct cmd_context *cmd, const char *vg_name) return 0; } - return backup_restore_from_file(cmd, vg_name, path); + return backup_restore_from_file(cmd, vg_name, path, force); } int backup_to_file(const char *file, const char *desc, struct volume_group *vg) diff --git a/lib/format_text/archiver.h b/lib/format_text/archiver.h index 7346f93..ddff687 100644 --- a/lib/format_text/archiver.h +++ b/lib/format_text/archiver.h @@ -53,8 +53,8 @@ struct volume_group *backup_read_vg(struct cmd_context *cmd, const char *vg_name, const char *file); int backup_restore_vg(struct cmd_context *cmd, struct volume_group *vg); int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name, - const char *file); -int backup_restore(struct cmd_context *cmd, const char *vg_name); + const char *file, int force); +int backup_restore(struct cmd_context *cmd, const char *vg_name, int force); int backup_to_file(const char *file, const char *desc, struct volume_group *vg); diff --git a/man/vgcfgrestore.8.in b/man/vgcfgrestore.8.in index 3b7b038..7b8dd59 100644 --- a/man/vgcfgrestore.8.in +++ b/man/vgcfgrestore.8.in @@ -6,6 +6,7 @@ vgcfgrestore \- restore volume group descriptor area .RB [ \-d | \-\-debug ] .RB [ \-f | \-\-file .RI < filename >] +.RB [ \-\-force ] .RB [ \-l [ l ]| \-\-list ] .RB [ \-h | \-\-help ] .RB [ \-M | \-\-metadatatype @@ -32,6 +33,14 @@ May be used with the \fB\-f\fP option. Does not restore \fIVolumeGroupName\fP. Name of LVM metadata backup file Specifies a metadata backup or archive file to be used for restoring VolumeGroupName. Often this file has been created with \fBvgcfgbackup\fP. +.TP +.B \-\-force +To restore metadata with thin pool volumes, user currently +needs to use this flag. The tool DOES NOT make any validation. +.br +WARNING: Restoring lvm2 metadata that are not matching thin pool +kernel metadata may lead to the destruction of the pool content. +Use with extreme caution. .SH REPLACING PHYSICAL VOLUMES \fBvgdisplay \-\-partial \-\-verbose\fP will show you the UUIDs and sizes of any PVs that are no longer present. diff --git a/tools/args.h b/tools/args.h index 0d9605a..d4d6c40 100644 --- a/tools/args.h +++ b/tools/args.h @@ -73,6 +73,7 @@ arg(poll_ARG, '\0', "poll", yes_no_arg, 0) arg(poolmetadata_ARG, '\0', "poolmetadata", string_arg, 0) arg(poolmetadatasize_ARG, '\0', "poolmetadatasize", size_mb_arg, 0) arg(discards_ARG, '\0', "discards", discards_arg, 0) +arg(force_long_ARG, '\0', "force", NULL, ARG_COUNTABLE) arg(stripes_long_ARG, '\0', "stripes", int_arg, 0) arg(sysinit_ARG, '\0', "sysinit", NULL, 0) arg(thinpool_ARG, '\0', "thinpool", string_arg, 0) diff --git a/tools/commands.h b/tools/commands.h index 8d5d190..986539e 100644 --- a/tools/commands.h +++ b/tools/commands.h @@ -725,6 +725,7 @@ xx(vgcfgrestore, "vgcfgrestore " "\n" "\t[-d|--debug] " "\n" "\t[-f|--file filename] " "\n" + "\t[--force]\n" "\t[-l[l]|--list [--list]]" "\n" "\t[-M|--metadatatype 1|2]" "\n" "\t[-h|--help]" "\n" @@ -733,7 +734,7 @@ xx(vgcfgrestore, "\t[--version] " "\n" "\tVolumeGroupName", - file_ARG, list_ARG, metadatatype_ARG, test_ARG) + file_ARG, force_long_ARG, list_ARG, metadatatype_ARG, test_ARG) xx(vgchange, "Change volume group attributes", diff --git a/tools/vgcfgrestore.c b/tools/vgcfgrestore.c index d62df99..20ca16b 100644 --- a/tools/vgcfgrestore.c +++ b/tools/vgcfgrestore.c @@ -62,8 +62,9 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv) if (!(arg_count(cmd, file_ARG) ? backup_restore_from_file(cmd, vg_name, - arg_str_value(cmd, file_ARG, "")) : - backup_restore(cmd, vg_name))) { + arg_str_value(cmd, file_ARG, ""), + arg_count(cmd, force_long_ARG)) : + backup_restore(cmd, vg_name, arg_count(cmd, force_long_ARG)))) { unlock_vg(cmd, VG_ORPHANS); unlock_vg(cmd, vg_name); log_error("Restore failed.");

1 0

master - thin: fix attrs for unloaded driver
by Zdenek Kabelac 28 Nov '12

28 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c7a7fd0a12d0daef… Commit: c7a7fd0a12d0daef70e3c4517ccdef6830c7a34e Parent: 8c49aa79e7372a9cea9f7fe114d26a47cc81cdf4 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Nov 26 11:05:30 2012 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Tue Nov 27 11:29:47 2012 +0100 thin: fix attrs for unloaded driver If the driver is not loaded, set all 'features' ON instead of all of them being OFF. --- tools/lvconvert.c | 1 + tools/lvcreate.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/lvconvert.c b/tools/lvconvert.c index fc58add..e428ce0 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -157,6 +157,7 @@ static int _read_params(struct lvconvert_params *lp, struct cmd_context *cmd, int pagesize = lvm_getpagesize(); memset(lp, 0, sizeof(*lp)); + lp->target_attr = ~0; if ((arg_count(cmd, snapshot_ARG) || arg_count(cmd, merge_ARG)) && (arg_count(cmd, mirrorlog_ARG) || arg_count(cmd, mirrors_ARG) || diff --git a/tools/lvcreate.c b/tools/lvcreate.c index 0d76bbe..78292f7 100644 --- a/tools/lvcreate.c +++ b/tools/lvcreate.c @@ -659,6 +659,7 @@ static int _lvcreate_params(struct lvcreate_params *lp, memset(lp, 0, sizeof(*lp)); memset(lcp, 0, sizeof(*lcp)); dm_list_init(&lp->tags); + lp->target_attr = ~0; /* * Check selected options are compatible and determine segtype

1 0

master - filters: Add STEC skd and Violin vtms devices
by Alasdair Kergon 27 Nov '12

27 Nov '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8c49aa79e7372a9c… Commit: 8c49aa79e7372a9cea9f7fe114d26a47cc81cdf4 Parent: 1ef98310187a7b287255cacd4b56160e48100d03 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Nov 26 14:55:17 2012 +0000 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Nov 26 14:55:17 2012 +0000 filters: Add STEC skd and Violin vtms devices --- WHATS_NEW | 2 ++ lib/filters/device-types.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 85fcd3e..2c6ad4c 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,7 @@ Version 2.02.99 - =================================== + Recognise STEC skd devices in filter. + Recognise Violin Memory vtms devices in filter. Add lvm.conf thin pool defs thin_pool_{chunk_size|discards|zero}. Support discards for non-power-of-2 thin pool chunks. Automatically restore MISSING PVs with no MDAs. diff --git a/lib/filters/device-types.h b/lib/filters/device-types.h index 9efbe68..aec4293 100644 --- a/lib/filters/device-types.h +++ b/lib/filters/device-types.h @@ -56,5 +56,7 @@ static const device_info_t _device_info[] = { {"blkext", 1}, /* Extended device partitions */ {"fio", 16}, /* Fusion */ {"mtip32xx", 16}, /* Micron PCIe SSDs */ + {"vtms", 16}, /* Violin Memory */ + {"skd", 16}, /* STEC */ {"", 0} };

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits November 2012