July 2012 - lvm2-commits - Fedora mailing-lists

master - systemd: integrate lvm2 activation generator with conf+make
by Peter Rajnoha 31 Jul '12

31 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=fa68466e904568d0… Commit: fa68466e904568d054f0b0cf5fdab6499cb47998 Parent: d3e67ba8ca13115ffdd324e64e965240dced8ef1 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Jul 31 16:46:24 2012 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue Jul 31 16:46:24 2012 +0200 systemd: integrate lvm2 activation generator with conf+make --- Makefile.in | 7 ++++++- WHATS_NEW | 2 ++ configure | 9 ++++++++- configure.in | 8 +++++++- make.tmpl.in | 3 ++- scripts/Makefile.in | 26 ++++++++++++++++++++------ 6 files changed, 45 insertions(+), 10 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5e0b348..04746d1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,7 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ -SUBDIRS = doc include man scripts +SUBDIRS = doc include man ifeq ("@UDEV_RULES@", "yes") SUBDIRS += udev @@ -36,6 +36,8 @@ ifeq ("@BUILD_LVMETAD@", "yes") SUBDIRS += libdaemon endif +SUBDIRS += scripts + # FIXME Should use intermediate Makefiles here! ifeq ($(MAKECMDGOALS),distclean) SUBDIRS = doc include man scripts \ @@ -98,6 +100,9 @@ install_system_dirs: install_initscripts: $(MAKE) -C scripts install_initscripts +install_systemd_generators: + $(MAKE) -C scripts install_systemd_generators + install_systemd_units: $(MAKE) -C scripts install_systemd_units diff --git a/WHATS_NEW b/WHATS_NEW index 5208da9..92dd0dc 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,7 @@ Version 2.02.97 - =============================== + Add make install_systemd_generators. + Add generator for lvm2 activation systemd units. Add lvm_config_find_bool lvm2app fn to retrieve bool value from config tree. Respect --test also when using lvmetad. No longer capitalise first LV attribute char for invalid snapshots. diff --git a/configure b/configure index ca71fdb..52f0e36 100755 --- a/configure +++ b/configure @@ -597,6 +597,7 @@ ac_subst_vars='LTLIBOBJS usrsbindir usrlibdir tmpfilesdir +systemdutildir systemdsystemunitdir udevdir udev_prefix @@ -9917,7 +9918,12 @@ if test -n "$pkg_systemdsystemunitdir"; then fi if test -z "$systemdsystemunitdir"; then - systemdsystemunitdir='/lib/systemd/system'; + systemdsystemunitdir='${exec_prefix}/lib/systemd/system'; +fi + +systemdutildir=$($PKG_CONFIG --variable=systemdutildir systemd) +if test -z "$systemdutildir"; then + systemdutildir='${exec_prefix}/lib/systemd'; fi ################################################################################ @@ -10566,6 +10572,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'` + ################################################################################ ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/raid/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile daemons/dmeventd/plugins/thin/Makefile daemons/lvmetad/Makefile doc/Makefile doc/example.conf include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/raid/Makefile lib/snapshot/Makefile lib/thin/Makefile libdaemon/Makefile libdaemon/client/Makefile libdaemon/server/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/lvm2_lvmetad_init_red_hat scripts/lvm2_l vmetad_systemd_red_hat.socket scripts/lvm2_lvmetad_systemd_red_hat.service scripts/lvm2_monitoring_init_red_hat scripts/dm_event_systemd_red_hat.socket scripts/dm_event_systemd_red_hat.service scripts/lvm2_monitoring_systemd_red_hat.service scripts/lvm2_tmpfiles_red_hat.conf scripts/Makefile test/Makefile test/api/Makefile test/unit/Makefile tools/Makefile udev/Makefile unit-tests/datastruct/Makefile unit-tests/regex/Makefile unit-tests/mm/Makefile" diff --git a/configure.in b/configure.in index 8bf0c4e..1c908f9 100644 --- a/configure.in +++ b/configure.in @@ -1275,7 +1275,12 @@ if test -n "$pkg_systemdsystemunitdir"; then fi if test -z "$systemdsystemunitdir"; then - systemdsystemunitdir='/lib/systemd/system'; + systemdsystemunitdir='${exec_prefix}/lib/systemd/system'; +fi + +systemdutildir=$($PKG_CONFIG --variable=systemdutildir systemd) +if test -z "$systemdutildir"; then + systemdutildir='${exec_prefix}/lib/systemd'; fi ################################################################################ AC_ARG_WITH(tmpfilesdir, @@ -1549,6 +1554,7 @@ AC_SUBST(tmpdir) AC_SUBST(udev_prefix) AC_SUBST(udevdir) AC_SUBST(systemdsystemunitdir) +AC_SUBST(systemdutildir) AC_SUBST(tmpfilesdir) AC_SUBST(usrlibdir) AC_SUBST(usrsbindir) diff --git a/make.tmpl.in b/make.tmpl.in index 25cc87f..b8b127f 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -67,7 +67,8 @@ staticdir = $(DESTDIR)@STATICDIR@ udevdir = $(DESTDIR)@udevdir@ pkgconfigdir = $(usrlibdir)/pkgconfig initdir = $(DESTDIR)$(sysconfdir)/rc.d/init.d -systemd_dir = $(DESTDIR)@systemdsystemunitdir@ +systemd_unit_dir = $(DESTDIR)@systemdsystemunitdir@ +systemd_generator_dir = $(DESTDIR)@systemdutildir@/system-generators tmpfiles_dir = $(DESTDIR)@tmpfilesdir@ ocf_scriptdir = $(DESTDIR)@OCFDIR@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 53c85f5..40396b0 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -15,9 +15,16 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ +SOURCES = lvm2_activation_generator_systemd_red_hat.c +TARGETS = lvm2_activation_generator_systemd_red_hat + include $(top_builddir)/make.tmpl +DEPLIBS += $(top_builddir)/liblvm/liblvm2app.so $(top_builddir)/libdm/libdevmapper.so +LVMLIBS = @LVM2APP_LIB@ -ldevmapper + SCRIPTS = lvmdump.sh lvmconf.sh vgimportclone.sh + ifeq ("@FSADM@", "yes") SCRIPTS += fsadm.sh endif @@ -59,16 +66,23 @@ ifeq ("@BUILD_CMIRRORD@", "yes") $(INSTALL_SCRIPT) cmirrord_init_red_hat $(initdir)/cmirrord endif +lvm2_activation_generator_systemd_red_hat: $(OBJECTS) $(DEPLIBS) + $(CC) -o $@ $(OBJECTS) $(LVMLIBS) + +install_systemd_generators: + $(INSTALL_DIR) $(systemd_generator_dir) + $(INSTALL_PROGRAM) lvm2_activation_generator_systemd_red_hat $(systemd_generator_dir)/lvm2-activation-generator + install_systemd_units: - $(INSTALL_DIR) $(systemd_dir) + $(INSTALL_DIR) $(systemd_unit_dir) ifeq ("@BUILD_DMEVENTD@", "yes") - $(INSTALL_DATA) dm_event_systemd_red_hat.socket $(systemd_dir)/dm-event.socket - $(INSTALL_DATA) dm_event_systemd_red_hat.service $(systemd_dir)/dm-event.service - $(INSTALL_DATA) lvm2_monitoring_systemd_red_hat.service $(systemd_dir)/lvm2-monitor.service + $(INSTALL_DATA) dm_event_systemd_red_hat.socket $(systemd_unit_dir)/dm-event.socket + $(INSTALL_DATA) dm_event_systemd_red_hat.service $(systemd_unit_dir)/dm-event.service + $(INSTALL_DATA) lvm2_monitoring_systemd_red_hat.service $(systemd_unit_dir)/lvm2-monitor.service endif ifeq ("@BUILD_LVMETAD@", "yes") - $(INSTALL_DATA) lvm2_lvmetad_systemd_red_hat.socket $(systemd_dir)/lvm2-lvmetad.socket - $(INSTALL_DATA) lvm2_lvmetad_systemd_red_hat.service $(systemd_dir)/lvm2-lvmetad.service + $(INSTALL_DATA) lvm2_lvmetad_systemd_red_hat.socket $(systemd_unit_dir)/lvm2-lvmetad.socket + $(INSTALL_DATA) lvm2_lvmetad_systemd_red_hat.service $(systemd_unit_dir)/lvm2-lvmetad.service endif install_tmpfiles_configuration:

1 0

master - systemd: add lvm2 activation generator
by Peter Rajnoha 31 Jul '12

31 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d3e67ba8ca13115f… Commit: d3e67ba8ca13115ffdd324e64e965240dced8ef1 Parent: f64f22e2d657346197fcd0b8e97e87b6d290ab2b Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Jul 31 16:20:24 2012 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue Jul 31 16:20:24 2012 +0200 systemd: add lvm2 activation generator The lvm2 activation generator generates systemd units conditionally based on the global/use_lvmetad lvm.conf setting. If use_lvmetad=0, the lvm2-activation-early.service and lvm2-activation.service units will be generated. These units are responsible for direct volume activation by calling "vgchange -aay --sysinit" (this is actually the original on-boot activation as it was used before). If use_lvmetad=1, no units will be generated as we're relying on autoactivation. Important thing to note is that the lvm2-activation units normally bring in the udev-settle ("storage-wait") service that waits for udev to settle (with block devices). We don't need this if lvmetad is used in conjunction with autoactivation feature... but systemd units can't be enabled or disabled (or dependencies added/removed) dynamically based on external configuration. Therefore, we need the unit generator which adds support for such situations: the units as a whole either exist or not based on the external configuration. --- .../lvm2_activation_generator_systemd_red_hat.c | 169 ++++++++++++++++++++ 1 files changed, 169 insertions(+), 0 deletions(-) diff --git a/scripts/lvm2_activation_generator_systemd_red_hat.c b/scripts/lvm2_activation_generator_systemd_red_hat.c new file mode 100644 index 0000000..9921004 --- /dev/null +++ b/scripts/lvm2_activation_generator_systemd_red_hat.c @@ -0,0 +1,169 @@ +/* + * Copyright (C) 2012 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * 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 +*/ + +#include <stdio.h> +#include <unistd.h> +#include <errno.h> +#include <stdarg.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include "lvm2app.h" + +#define KMSG_DEV_PATH "/dev/kmsg" +#define LVM_CONF_USE_LVMETAD "global/use_lvmetad" + +#define DEFAULT_UNIT_DIR "/tmp" +#define UNIT_NAME_EARLY "lvm2-activation-early.service" +#define UNIT_NAME "lvm2-activation.service" +#define UNIT_TARGET "local-fs.target" + +static char unit_path[PATH_MAX]; +static char target_path[PATH_MAX]; +static char message[PATH_MAX]; +static int kmsg_fd = -1; + +static void kmsg(const char *format, ...) +{ + va_list ap; + int n; + + va_start(ap, format); + n = vsnprintf(message, sizeof(message), format, ap); + va_end(ap); + + if (kmsg_fd < 0 || (n < 0 || ((unsigned) n + 1 > sizeof(message)))) + return; + + write(kmsg_fd, message, n + 1); +} + +static int lvm_uses_lvmetad(void) +{ + lvm_t lvm; + int r; + + if (!(lvm = lvm_init(NULL))) { + kmsg("LVM: Failed to initialize library context for activation generator.\n"); + return 0; + } + r = lvm_config_find_bool(lvm, LVM_CONF_USE_LVMETAD, 0); + lvm_quit(lvm); + + return r; +} + +static int register_unit_with_target(const char *dir, const char *unit, const char *target) +{ + int r = 1; + + if (dm_snprintf(target_path, PATH_MAX, "%s/%s.wants", dir, target) < 0) { + r = 0; goto out; + } + (void) dm_prepare_selinux_context(target_path, S_IFDIR); + if (mkdir(target_path, 0755) < 0 && errno != EEXIST) { + kmsg("LVM: Failed to create target directory %s: %m.\n", target_path); + r = 0; goto out; + } + + if (dm_snprintf(target_path, PATH_MAX, "%s/%s.wants/%s", dir, target, unit) < 0) { + r = 0; goto out; + } + (void) dm_prepare_selinux_context(target_path, S_IFLNK); + if (symlink(unit_path, target_path) < 0) { + kmsg("LVM: Failed to create symlink for unit %s: %m.\n", unit); + r = 0; + } +out: + dm_prepare_selinux_context(NULL, 0); + return r; +} + +static int generate_unit(const char *dir, int early) +{ + FILE *f; + const char *unit = early ? UNIT_NAME_EARLY : UNIT_NAME; + + if (dm_snprintf(unit_path, PATH_MAX, "%s/%s", dir, unit) < 0) + return 0; + + if (!(f = fopen(unit_path, "wxe"))) { + kmsg("LVM: Failed to create unit file %s: %m.\n", unit); + return 0; + } + + fputs("# Automatically generated by lvm2-activation-generator.\n" + "#\n" + "# This unit is responsible for direct activation of LVM2 logical volumes\n" + "# if lvmetad daemon is not used (global/use_lvmetad=0 lvm.conf setting),\n" + "# hence volume autoactivation is not applicable.\n" + "# Direct LVM2 activation requires udev to be settled!\n\n" + "[Unit]\n" + "Description=Activation of LVM2 logical volumes\n" + "Documentation=man:lvm(8) man:vgchange(8)\n" + "SourcePath=/etc/lvm/lvm.conf\n" + "DefaultDependencies=no\n", f); + + if (early) + fputs("After=fedora-wait-storage.service\n", f); + else + fputs("After=lvm2-activation-early.service cryptsetup.target\n", f); + + fputs("Before=local-fs.target shutdown.target\n" + "Wants=fedora-wait-storage.service\n\n" + "[Service]\n" + "ExecStart=/usr/sbin/lvm vgchange -aay --sysinit\n" + "Type=oneshot\n", f); + + if (fclose(f) < 0) { + kmsg("LVM: Failed to write unit file %s: %m.\n", unit); + return 0; + } + + if (!register_unit_with_target(dir, unit, UNIT_TARGET)) { + kmsg("LVM: Failed to register unit %s with target %s.\n", unit, UNIT_TARGET); + return 0; + } + + return 1; +} + +int main(int argc, char *argv[]) +{ + const char *dir; + int r = EXIT_SUCCESS; + + kmsg_fd = open(KMSG_DEV_PATH, O_WRONLY|O_NOCTTY|O_CLOEXEC); + + if (argc > 1 && argc != 4) { + kmsg("LVM: Activation generator takes three or no arguments.\n"); + r = EXIT_FAILURE; goto out; + } + + /* If lvmetad used, rely on autoactivation instead of direct activation. */ + if (lvm_uses_lvmetad()) { + kmsg("LVM: Logical Volume autoactivation enabled.\n"); + goto out; + } + + dir = argc > 1 ? argv[1] : DEFAULT_UNIT_DIR; + + if (!generate_unit(dir, 1) || !generate_unit(dir, 0)) + r = EXIT_FAILURE; +out: + kmsg("LVM: Activation generator %s.\n", r ? "failed" : "successfully completed"); + if (kmsg_fd != -1) + close(kmsg_fd); + return r; +}

1 0

master - lvm2app: add lvm_config_find_bool function
by Peter Rajnoha 31 Jul '12

31 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=f64f22e2d6573461… Commit: f64f22e2d657346197fcd0b8e97e87b6d290ab2b Parent: 8791d01fee7f5977b037400020db97a40821b94a Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Jul 31 16:18:01 2012 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue Jul 31 16:18:01 2012 +0200 lvm2app: add lvm_config_find_bool function To effectively retrieve the setting of anything that could be enabled or disabled. --- WHATS_NEW | 1 + liblvm/lvm2app.h | 22 ++++++++++++++++++++++ liblvm/lvm_base.c | 5 +++++ 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index cb3ed90..5208da9 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Add lvm_config_find_bool lvm2app fn to retrieve bool value from config tree. Respect --test also when using lvmetad. No longer capitalise first LV attribute char for invalid snapshots. Allow vgextend to add PVs to a VG that is missing PVs. diff --git a/liblvm/lvm2app.h b/liblvm/lvm2app.h index dd200e3..72c0d79 100644 --- a/liblvm/lvm2app.h +++ b/liblvm/lvm2app.h @@ -303,6 +303,28 @@ int lvm_config_reload(lvm_t libh); int lvm_config_override(lvm_t libh, const char *config_string); /** + * Find a boolean value in the LVM configuration. + * + * \memberof lvm_t + * + * This function finds a boolean value associated with a path + * in current LVM configuration. + * + * \param libh + * Handle obtained from lvm_init(). + * + * \param config_path + * A path in LVM configuration + * + * \param fail + * Value to return if the path is not found. + * + * \return + * boolean value for 'config_path' (success) or the value of 'fail' (error) + */ +int lvm_config_find_bool(lvm_t libh, const char *config_path, int fail); + +/** * Return stored error no describing last LVM API error. * * \memberof lvm_t diff --git a/liblvm/lvm_base.c b/liblvm/lvm_base.c index 599c859..2f39b46 100644 --- a/liblvm/lvm_base.c +++ b/liblvm/lvm_base.c @@ -94,6 +94,11 @@ int lvm_config_override(lvm_t libh, const char *config_settings) return 0; } +int lvm_config_find_bool(lvm_t libh, const char *config_path, int fail) +{ + return find_config_tree_bool((struct cmd_context *)libh, config_path, fail); +} + int lvm_errno(lvm_t libh) { return stored_errno();

1 0

master - lvmetad: Fix an obscure error message.
by Petr Rockai 31 Jul '12

31 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8791d01fee7f5977… Commit: 8791d01fee7f5977b037400020db97a40821b94a Parent: e0c2211c34f49784e30c6001b383e5a493d991a5 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Tue Jul 31 11:43:35 2012 +0200 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Tue Jul 31 11:43:35 2012 +0200 lvmetad: Fix an obscure error message. --- daemons/lvmetad/lvmetad-core.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/daemons/lvmetad/lvmetad-core.c b/daemons/lvmetad/lvmetad-core.c index d41a905..0b0ec73 100644 --- a/daemons/lvmetad/lvmetad-core.c +++ b/daemons/lvmetad/lvmetad-core.c @@ -918,8 +918,7 @@ static response pv_found(lvmetad_state *s, request r) else { unlock_vg(s, vgid); return daemon_reply_simple("failed", "reason = %s", -// FIXME provide meaningful-to-user error message - "internal treason!", NULL); + "non-orphan VG without metadata encountered", NULL); } unlock_vg(s, vgid); }

1 0

master - libdm-string: Add dm_vasprintf.
by Petr Rockai 31 Jul '12

31 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e0c2211c34f49784… Commit: e0c2211c34f49784e30c6001b383e5a493d991a5 Parent: 88ae8840959e353268057684365e00b02b2c29c4 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Mon Jul 30 16:41:15 2012 +0200 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Tue Jul 31 11:12:34 2012 +0200 libdm-string: Add dm_vasprintf. --- libdm/libdevmapper.h | 1 + libdm/libdm-string.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 02bf421..0786b38 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -1291,6 +1291,7 @@ int dm_fclose(FILE *stream); */ int dm_asprintf(char **buf, const char *format, ...) __attribute__ ((format(printf, 2, 3))); +int dm_vasprintf(char **buf, const char *format, va_list ap); /* * create lockfile (pidfile) - create and lock a lock file diff --git a/libdm/libdm-string.c b/libdm/libdm-string.c index 776ec97..5ef6334 100644 --- a/libdm/libdm-string.c +++ b/libdm/libdm-string.c @@ -129,7 +129,7 @@ const char *dm_basename(const char *path) return p ? p + 1 : path; } -int dm_asprintf(char **result, const char *format, ...) +int dm_vasprintf(char **result, const char *format, va_list aq) { int i, n, size = 16; va_list ap; @@ -141,7 +141,7 @@ int dm_asprintf(char **result, const char *format, ...) return -1; for (i = 0;; i++) { - va_start(ap, format); + va_copy(ap, aq); n = vsnprintf(buf, size, format, ap); va_end(ap); @@ -168,6 +168,16 @@ int dm_asprintf(char **result, const char *format, ...) return n + 1; } +int dm_asprintf(char **result, const char *format, ...) +{ + int r; + va_list ap; + va_start(ap, format); + r = dm_vasprintf(result, format, ap); + va_end(ap); + return r; +} + /* * Count occurences of 'c' in 'str' until we reach a null char. *

1 0

master - version: update
by Alasdair Kergon 30 Jul '12

30 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=88ae8840959e3532… Commit: 88ae8840959e353268057684365e00b02b2c29c4 Parent: 4b48b62ab0a849cdde14c136020bb58d07455971 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Jul 30 18:00:08 2012 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Jul 30 18:00:08 2012 +0100 version: update --- VERSION | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/VERSION b/VERSION index e1fd846..8b62010 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.02.97(2)-git (2012-07-30) +2.02.97(2)-git (2012-07-29)

1 0

master - version: update
by Alasdair Kergon 30 Jul '12

30 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4b48b62ab0a849cd… Commit: 4b48b62ab0a849cdde14c136020bb58d07455971 Parent: 3227cd8aac5401b16caf168257a77d5ea7e80c86 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Jul 30 17:47:04 2012 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Jul 30 17:47:04 2012 +0100 version: update --- VERSION_DM | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/VERSION_DM b/VERSION_DM index 49320a1..e01aaa7 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.76-git (2012-07-29) +1.02.76-git (2012-07-30)

1 0

master - version: update
by Alasdair Kergon 30 Jul '12

30 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3227cd8aac5401b1… Commit: 3227cd8aac5401b16caf168257a77d5ea7e80c86 Parent: e39de2282214e8716a9e6e3152a0957889fe6f29 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Jul 30 17:38:51 2012 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Jul 30 17:38:51 2012 +0100 version: update --- VERSION_DM | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/VERSION_DM b/VERSION_DM index e01aaa7..49320a1 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.76-git (2012-07-30) +1.02.76-git (2012-07-29)

1 0

master - version: update
by Alasdair Kergon 30 Jul '12

30 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e39de2282214e871… Commit: e39de2282214e8716a9e6e3152a0957889fe6f29 Parent: 20ca6d6545e6a0a8e84c117fd4530de0421bc78d Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Mon Jul 30 16:17:16 2012 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Mon Jul 30 16:17:16 2012 +0100 version: update Update version date. --- VERSION | 2 +- VERSION_DM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index b26c415..e1fd846 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.02.97(2)-git (2012-06-09) +2.02.97(2)-git (2012-07-30) diff --git a/VERSION_DM b/VERSION_DM index 749d204..e01aaa7 100644 --- a/VERSION_DM +++ b/VERSION_DM @@ -1 +1 @@ -1.02.76-git (2012-06-09) +1.02.76-git (2012-07-30)

1 0

master - TEST: Add lvmetad-test; checks --test with lvmetad.
by Petr Rockai 30 Jul '12

30 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=20ca6d6545e6a0a8… Commit: 20ca6d6545e6a0a8e84c117fd4530de0421bc78d Parent: 6997943f2221729449469d1a7963055991c2361d Author: Petr Rockai <me(a)mornfall.net> AuthorDate: Mon Jul 30 11:21:55 2012 +0200 Committer: Petr Rockai <me(a)mornfall.net> CommitterDate: Mon Jul 30 11:21:55 2012 +0200 TEST: Add lvmetad-test; checks --test with lvmetad. --- test/shell/lvmetad-test.sh | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/test/shell/lvmetad-test.sh b/test/shell/lvmetad-test.sh new file mode 100644 index 0000000..7e801f1 --- /dev/null +++ b/test/shell/lvmetad-test.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# 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 + +. lib/test + +aux prepare_pvs 2 + +vgcreate $vg1 $dev1 $dev2 --test +vgs | not grep $vg1 +vgcreate $vg1 $dev1 $dev2 +vgs | grep $vg1 + +lvcreate -n bar -l 1 $vg1 --test +lvs | not grep bar +lvcreate -n bar -l 1 $vg1 +lvs | grep bar + +lvremove $vg1/bar -f --test +lvs | grep bar +lvremove $vg1/bar -f +lvs | not grep bar + +vgremove $vg1 --test +vgs | grep $vg1 +vgremove $vg1 +vgs | not grep $vg1

1 0

master - lvmetad: Implement --test (fixes #832033).
by Petr Rockai 30 Jul '12

30 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=6997943f22217294… Commit: 6997943f2221729449469d1a7963055991c2361d Parent: 4dbf872a9fc0aac34f73fd8214cc75846554e501 Author: Petr Rockai <me(a)mornfall.net> AuthorDate: Mon Jul 30 10:44:11 2012 +0200 Committer: Petr Rockai <me(a)mornfall.net> CommitterDate: Mon Jul 30 11:19:02 2012 +0200 lvmetad: Implement --test (fixes #832033). --- WHATS_NEW | 1 + lib/cache/lvmetad.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a09e076..cb3ed90 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Respect --test also when using lvmetad. No longer capitalise first LV attribute char for invalid snapshots. Allow vgextend to add PVs to a VG that is missing PVs. Recognise Micron PCIe SSDs in filter and move array out to device-types.h. diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c index 6ef30db..3384ec4 100644 --- a/lib/cache/lvmetad.c +++ b/lib/cache/lvmetad.c @@ -275,7 +275,7 @@ int lvmetad_vg_update(struct volume_group *vg) if (!vg) return 0; - if (!_using_lvmetad) + if (!_using_lvmetad || test_mode()) return 1; /* fake it */ /* TODO. This is not entirely correct, since export_vg_to_buffer @@ -335,7 +335,7 @@ int lvmetad_vg_remove(struct volume_group *vg) daemon_reply reply; int result; - if (!_using_lvmetad) + if (!_using_lvmetad || test_mode()) return 1; /* just fake it */ if (!id_write_format(&vg->id, uuid, sizeof(uuid))) @@ -547,7 +547,7 @@ int lvmetad_pv_found(struct id pvid, struct device *device, const struct format_ const char *status; int result; - if (!_using_lvmetad) + if (!_using_lvmetad || test_mode()) return 1; if (!id_write_format(&pvid, uuid, sizeof(uuid))) @@ -629,7 +629,7 @@ int lvmetad_pv_gone(dev_t device, const char *pv_name, activation_handler handle int result; int found; - if (!_using_lvmetad) + if (!_using_lvmetad || test_mode()) return 1; /*

1 0

master - reports: invalid snaps do not capitalise lv_attr
by Alasdair Kergon 27 Jul '12

27 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4dbf872a9fc0aac3… Commit: 4dbf872a9fc0aac34f73fd8214cc75846554e501 Parent: 25ae0b39b77d80990d0821729ab4f2307bd38c16 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Jul 27 20:19:28 2012 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Jul 27 20:19:28 2012 +0100 reports: invalid snaps do not capitalise lv_attr No longer capitalise first LV attribute char for invalid snapshots. This state is available from the 5th char now (I or S). --- WHATS_NEW | 1 + lib/metadata/lv.c | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 32ebf15..a09e076 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + No longer capitalise first LV attribute char for invalid snapshots. Allow vgextend to add PVs to a VG that is missing PVs. Recognise Micron PCIe SSDs in filter and move array out to device-types.h. Fix segfault when attempting to replace RAID 4/5/6 device (2.02.97). diff --git a/lib/metadata/lv.c b/lib/metadata/lv.c index 747bf9e..bb6043d 100644 --- a/lib/metadata/lv.c +++ b/lib/metadata/lv.c @@ -448,7 +448,6 @@ char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv) if (info.live_table && lv_is_cow(lv)) { if (!lv_snapshot_percent(lv, &snap_percent) || snap_percent == PERCENT_INVALID) { - repstr[0] = toupper(repstr[0]); if (info.suspended) repstr[4] = 'S'; /* Susp Inv snapshot */ else

1 0

master - dmsetup: allow --noflush with status/wait for thin
by Alasdair Kergon 27 Jul '12

27 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=25ae0b39b77d8099… Commit: 25ae0b39b77d80990d0821729ab4f2307bd38c16 Parent: 186a2772e8ac3c2088bdfc833c32d773464d666b Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Fri Jul 27 20:03:07 2012 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Jul 27 20:03:07 2012 +0100 dmsetup: allow --noflush with status/wait for thin Allow --noflush with dmsetup status and wait (for thin target 1.3.0 / ioctl 4.23.0). --- WHATS_NEW_DM | 1 + libdm/misc/dm-ioctl.h | 12 +++++++----- man/dmsetup.8.in | 9 ++++++++- tools/dmsetup.c | 7 +++++-- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 0bfd016..a790ccf 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.76 - =============================== + Allow --noflush with dmsetup status and wait (for thin target). Add dm_config_write_one_node to libdevmapper. Add support for thin pool message release/reserve_metadata_snap. Add support for thin pool discard and external origin. diff --git a/libdm/misc/dm-ioctl.h b/libdm/misc/dm-ioctl.h index c031315..1cf66fe 100644 --- a/libdm/misc/dm-ioctl.h +++ b/libdm/misc/dm-ioctl.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2001 - 2003 Sistina Software (UK) Limited. - * Copyright (C) 2004 - 2009 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004 - 2012 Red Hat, Inc. All rights reserved. * * This file is released under the LGPL. */ @@ -269,9 +269,9 @@ enum { #define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl) #define DM_VERSION_MAJOR 4 -#define DM_VERSION_MINOR 20 +#define DM_VERSION_MINOR 23 #define DM_VERSION_PATCHLEVEL 0 -#define DM_VERSION_EXTRA "-ioctl (2011-02-02)" +#define DM_VERSION_EXTRA "-ioctl (2012-07-25)" /* Status bits */ #define DM_READONLY_FLAG (1 << 0) /* In/Out */ @@ -309,6 +309,8 @@ enum { /* * Set this to suspend without flushing queued ios. + * Also disables flushing uncommitted changes in the thin target before + * generating statistics for DM_TABLE_STATUS and DM_DEV_WAIT. */ #define DM_NOFLUSH_FLAG (1 << 11) /* In */ @@ -331,8 +333,8 @@ enum { #define DM_UUID_FLAG (1 << 14) /* In */ /* - * If set, all buffers are wiped after use. Used when sending - * or requesting sensitive data like crypt key. + * If set, all buffers are wiped after use. Use when sending + * or requesting sensitive data such as an encryption key. */ #define DM_SECURE_DATA_FLAG (1 << 15) /* In */ diff --git a/man/dmsetup.8.in b/man/dmsetup.8.in index 8eb679b..90c715f 100644 --- a/man/dmsetup.8.in +++ b/man/dmsetup.8.in @@ -109,6 +109,7 @@ dmsetup \- low level logical volume management .B dmsetup status .RB [ \-\-target .IR target_type ] +.RB [ \-\-noflush ] .RI [ device_name ] .br .B dmsetup suspend @@ -143,6 +144,7 @@ dmsetup \- low level logical volume management .B dmsetup version .br .B dmsetup wait +.RB [ \-\-noflush ] .I device_name .RI [ event_nr ] .br @@ -477,11 +479,13 @@ Default subsystem is LVM. .B status .RB [ \-\-target .IR target_type ] +.RB [ \-\-noflush ] .RI [ device_name ] .br Outputs status information for each of the device's targets. With \-\-target, only information relating to the specified target type -is displayed. +any is displayed. With \-\-noflush, the thin target (from version 1.3.0) +doesn't commit any outstanding changes to disk before reporting its statistics. .br .HP .B suspend @@ -577,6 +581,7 @@ Outputs version information. .TP .B wait +.RB [ \-\-noflush ] .I device_name .RI [ event_nr ] .br @@ -584,6 +589,8 @@ Sleeps until the event counter for device_name exceeds event_nr. Use \-v to see the event number returned. To wait until the next event is triggered, use \fBinfo\fP to find the last event number. +With \-\-noflush, the thin target (from version 1.3.0) doesn't commit +any outstanding changes to disk before reporting its statistics. .SH TABLE FORMAT Each line of the table specifies a single target and is of the form: .P diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 2787b76..5422f0b 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -1642,6 +1642,9 @@ static int _status(CMD_ARGS) if (_switches[CHECKS_ARG] && !dm_task_enable_checks(dmt)) goto out; + if (_switches[NOFLUSH_ARG] && !dm_task_no_flush(dmt)) + goto out; + if (!dm_task_run(dmt)) goto out; @@ -2994,9 +2997,9 @@ static struct command _commands[] = { {"ls", "[--target <target_type>] [--exec <command>] [-o options] [--tree]", 0, 0, 0, _ls}, {"info", "[<device>]", 0, -1, 1, _info}, {"deps", "[-o options] [<device>]", 0, -1, 1, _deps}, - {"status", "[<device>] [--target <target_type>]", 0, -1, 1, _status}, + {"status", "[<device>] [--noflush] [--target <target_type>]", 0, -1, 1, _status}, {"table", "[<device>] [--target <target_type>] [--showkeys]", 0, -1, 1, _status}, - {"wait", "<device> [<event_nr>]", 0, 2, 0, _wait}, + {"wait", "<device> [<event_nr>] [--noflush]", 0, 2, 0, _wait}, {"mknodes", "[<device>]", 0, -1, 1, _mknodes}, {"mangle", "[<device>]", 0, -1, 1, _mangle}, {"udevcreatecookie", "", 0, 0, 0, _udevcreatecookie},

1 0

master - vgextend: Allow PVs to be added to VGs that have PVs missing
by Jonathan Brassow 26 Jul '12

26 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=186a2772e8ac3c20… Commit: 186a2772e8ac3c2088bdfc833c32d773464d666b Parent: 45db25817ff342a86b2ddf000b4b3a4d59be8848 Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Thu Jul 26 17:06:06 2012 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Thu Jul 26 17:06:06 2012 -0500 vgextend: Allow PVs to be added to VGs that have PVs missing Allowing people to add devices to a VG that has PVs missing helps people avoid the inability to repair RAID LVs in certain cases. For example, if a user creates a RAID 4/5/6 LV using all of the available devices in a VG, there will be no spare devices to repair the LV with if a device should fail. Further, because the VG is missing a device, new devices cannot be added to allow the repair. If 'vgreduce --removemissing' were attempted, the "MISSING" PV could not be removed without also destroying the RAID LV. Allowing vgextend to operate solves the circular dependency. When the PV is added by a vgextend operation, the sequence number is incremented and the 'MISSING' flag is put on the PVs which are missing. --- WHATS_NEW | 1 + tools/vgextend.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 735bdba..32ebf15 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Allow vgextend to add PVs to a VG that is missing PVs. Recognise Micron PCIe SSDs in filter and move array out to device-types.h. Fix segfault when attempting to replace RAID 4/5/6 device (2.02.97). Fix dumpconfig <node> to print only <node> without its siblings (2.02.89). diff --git a/tools/vgextend.c b/tools/vgextend.c index d1adf21..161796c 100644 --- a/tools/vgextend.c +++ b/tools/vgextend.c @@ -66,8 +66,13 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv) return EINVALID_CMD_LINE; } - if (arg_count(cmd, restoremissing_ARG)) - cmd->handles_missing_pvs = 1; + /* + * It is always ok to add new PVs to a VG - even if there are + * missing PVs. No LVs are affected by this operation, but + * repair processes - particularly for RAID segtypes - can + * be facilitated. + */ + cmd->handles_missing_pvs = 1; log_verbose("Checking for volume group \"%s\"", vg_name); vg = vg_read_for_update(cmd, vg_name, NULL, 0);

1 0

master - filters: move device_info_t definition to header
by Alasdair Kergon 26 Jul '12

26 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=45db25817ff342a8… Commit: 45db25817ff342a86b2ddf000b4b3a4d59be8848 Parent: 9161308252336491a107983ed16481e446853e26 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Jul 26 12:22:55 2012 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Jul 26 12:22:55 2012 +0100 filters: move device_info_t definition to header --- lib/filters/device-types.h | 5 +++++ lib/filters/filter.c | 9 ++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/filters/device-types.h b/lib/filters/device-types.h index 1208160..9efbe68 100644 --- a/lib/filters/device-types.h +++ b/lib/filters/device-types.h @@ -13,6 +13,11 @@ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +typedef struct { + const char name[15]; + const int8_t max_partitions; +} device_info_t; + /* * Devices are only checked for partition tables if their minor number * is a multiple of the number corresponding to their type below diff --git a/lib/filters/filter.c b/lib/filters/filter.c index bab20ec..dcb6c5e 100644 --- a/lib/filters/filter.c +++ b/lib/filters/filter.c @@ -27,6 +27,8 @@ #include <fcntl.h> #include <limits.h> +#include "device-types.h" + #define NUMBER_OF_MAJORS 4096 #define PARTITION_SCSI_DEVICE (1 << 0) @@ -35,13 +37,6 @@ static struct { int flags; } _partitions[NUMBER_OF_MAJORS]; -typedef struct { - const char name[15]; - const int8_t max_partitions; -} device_info_t; - -#include "device-types.h" - static int _md_major = -1; static int _blkext_major = -1; static int _drbd_major = -1;

1 0

master - systemd: ensure monitoring is handled after lvmetad
by Peter Rajnoha 26 Jul '12

26 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9161308252336491… Commit: 9161308252336491a107983ed16481e446853e26 Parent: e0bc3cf1a0102aff6c047a3293ef45ca5f221c10 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Jul 26 11:30:27 2012 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Thu Jul 26 11:30:27 2012 +0200 systemd: ensure monitoring is handled after lvmetad Monitoring is handled using "vgchange --monitor" call. Ensure that lvmetad is up and running at the time of this call to prevent any fallback to direct scan within the vgchange. The same applies for shutdown sequence but the other way round - switch monitoring off and lvmetad afterwards. --- scripts/lvm2_monitoring_systemd_red_hat.service.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in index a8d5183..425cb0d 100644 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in @@ -2,7 +2,7 @@ Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8) Requires=dm-event.socket -After=dm-event.socket fedora-storage-init.service fedora-storage-init-late.service +After=dm-event.socket fedora-storage-init.service fedora-storage-init-late.service lvm2-lvmetad.service Before=local-fs.target DefaultDependencies=no Conflicts=shutdown.target

1 0

master - filters: Add Micron PCIe SSDs (mtip32xx) [part2]
by Alasdair Kergon 25 Jul '12

25 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=e0bc3cf1a0102aff… Commit: e0bc3cf1a0102aff6c047a3293ef45ca5f221c10 Parent: 7803756e9751117c8a2454d55c145f6e759279dd Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Jul 26 02:31:06 2012 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Jul 26 02:31:06 2012 +0100 filters: Add Micron PCIe SSDs (mtip32xx) [part2] Recognise Micron PCIe SSDs in filter and move array out to device-types.h. --- lib/filters/device-types.h | 55 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/lib/filters/device-types.h b/lib/filters/device-types.h new file mode 100644 index 0000000..1208160 --- /dev/null +++ b/lib/filters/device-types.h @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. + * Copyright (C) 2004-2012 Red Hat, Inc. All rights reserved. + * + * This file is part of LVM2. + * + * 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 Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser 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 + */ + +/* + * Devices are only checked for partition tables if their minor number + * is a multiple of the number corresponding to their type below + * i.e. this gives the granularity of whole-device minor numbers. + * Use 1 if the device is not partitionable. + * + * The list can be supplemented with devices/types in the config file. + */ +static const device_info_t _device_info[] = { + {"ide", 64}, /* IDE disk */ + {"sd", 16}, /* SCSI disk */ + {"md", 1}, /* Multiple Disk driver (SoftRAID) */ + {"mdp", 1}, /* Partitionable MD */ + {"loop", 1}, /* Loop device */ + {"dasd", 4}, /* DASD disk (IBM S/390, zSeries) */ + {"dac960", 8}, /* DAC960 */ + {"nbd", 16}, /* Network Block Device */ + {"ida", 16}, /* Compaq SMART2 */ + {"cciss", 16}, /* Compaq CCISS array */ + {"ubd", 16}, /* User-mode virtual block device */ + {"ataraid", 16}, /* ATA Raid */ + {"drbd", 16}, /* Distributed Replicated Block Device */ + {"emcpower", 16}, /* EMC Powerpath */ + {"power2", 16}, /* EMC Powerpath */ + {"i2o_block", 16}, /* i2o Block Disk */ + {"iseries/vd", 8}, /* iSeries disks */ + {"gnbd", 1}, /* Network block device */ + {"ramdisk", 1}, /* RAM disk */ + {"aoe", 16}, /* ATA over Ethernet */ + {"device-mapper", 1}, /* Other mapped devices */ + {"xvd", 16}, /* Xen virtual block device */ + {"vdisk", 8}, /* SUN's LDOM virtual block device */ + {"ps3disk", 16}, /* PlayStation 3 internal disk */ + {"virtblk", 8}, /* VirtIO disk */ + {"mmc", 16}, /* MMC block device */ + {"blkext", 1}, /* Extended device partitions */ + {"fio", 16}, /* Fusion */ + {"mtip32xx", 16}, /* Micron PCIe SSDs */ + {"", 0} +};

1 0

master - filters: Add Micron PCIe SSDs (mtip32xx)
by Alasdair Kergon 25 Jul '12

25 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7803756e9751117c… Commit: 7803756e9751117c8a2454d55c145f6e759279dd Parent: 599f18db8aadcc0f4818471ec5b47298a5a8ef54 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Thu Jul 26 02:26:40 2012 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Thu Jul 26 02:26:40 2012 +0100 filters: Add Micron PCIe SSDs (mtip32xx) Recognise Micron PCIe SSDs in filter and move array out to device-types.h. --- WHATS_NEW | 1 + lib/filters/filter.c | 42 ++---------------------------------------- 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index bca890e..735bdba 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Recognise Micron PCIe SSDs in filter and move array out to device-types.h. Fix segfault when attempting to replace RAID 4/5/6 device (2.02.97). Fix dumpconfig <node> to print only <node> without its siblings (2.02.89). Do not issue "Failed to handle a client connection" error if lvmetad killed. diff --git a/lib/filters/filter.c b/lib/filters/filter.c index 11b94c1..bab20ec 100644 --- a/lib/filters/filter.c +++ b/lib/filters/filter.c @@ -40,6 +40,8 @@ typedef struct { const int8_t max_partitions; } device_info_t; +#include "device-types.h" + static int _md_major = -1; static int _blkext_major = -1; static int _drbd_major = -1; @@ -99,46 +101,6 @@ const char *dev_subsystem_name(const struct device *dev) return ""; } -/* - * Devices are only checked for partition tables if their minor number - * is a multiple of the number corresponding to their type below - * i.e. this gives the granularity of whole-device minor numbers. - * Use 1 if the device is not partitionable. - * - * The list can be supplemented with devices/types in the config file. - */ -static const device_info_t _device_info[] = { - {"ide", 64}, /* IDE disk */ - {"sd", 16}, /* SCSI disk */ - {"md", 1}, /* Multiple Disk driver (SoftRAID) */ - {"mdp", 1}, /* Partitionable MD */ - {"loop", 1}, /* Loop device */ - {"dasd", 4}, /* DASD disk (IBM S/390, zSeries) */ - {"dac960", 8}, /* DAC960 */ - {"nbd", 16}, /* Network Block Device */ - {"ida", 16}, /* Compaq SMART2 */ - {"cciss", 16}, /* Compaq CCISS array */ - {"ubd", 16}, /* User-mode virtual block device */ - {"ataraid", 16}, /* ATA Raid */ - {"drbd", 16}, /* Distributed Replicated Block Device */ - {"emcpower", 16}, /* EMC Powerpath */ - {"power2", 16}, /* EMC Powerpath */ - {"i2o_block", 16}, /* i2o Block Disk */ - {"iseries/vd", 8}, /* iSeries disks */ - {"gnbd", 1}, /* Network block device */ - {"ramdisk", 1}, /* RAM disk */ - {"aoe", 16}, /* ATA over Ethernet */ - {"device-mapper", 1}, /* Other mapped devices */ - {"xvd", 16}, /* Xen virtual block device */ - {"vdisk", 8}, /* SUN's LDOM virtual block device */ - {"ps3disk", 16}, /* PlayStation 3 internal disk */ - {"virtblk", 8}, /* VirtIO disk */ - {"mmc", 16}, /* MMC block device */ - {"blkext", 1}, /* Extended device partitions */ - {"fio", 16}, /* Fusion */ - {"", 0} -}; - static int _passes_lvm_type_device_filter(struct dev_filter *f __attribute__((unused)), struct device *dev) {

1 0

master - TEST: Conditionalize RAID tests on whether the dm-raid module exists
by Jonathan Brassow 25 Jul '12

25 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=599f18db8aadcc0f… Commit: 599f18db8aadcc0f4818471ec5b47298a5a8ef54 Parent: 81e89c0647d856d328ac6ccc8db55472b5746181 Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Wed Jul 25 09:43:28 2012 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Wed Jul 25 09:43:28 2012 -0500 TEST: Conditionalize RAID tests on whether the dm-raid module exists --- test/shell/lvconvert-repair.sh | 44 ++++++++++++++++++++------------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/test/shell/lvconvert-repair.sh b/test/shell/lvconvert-repair.sh index 0aeeffa..51bc9de 100644 --- a/test/shell/lvconvert-repair.sh +++ b/test/shell/lvconvert-repair.sh @@ -113,26 +113,28 @@ aux enable_dev "$dev3" vgextend $vg "$dev3" lvremove -ff $vg -# RAID5 single replace -lvcreate --type raid5 -i 2 -l 2 -n $lv1 $vg "$dev1" "$dev2" "$dev3" -aux wait_for_sync $vg $lv1 -aux disable_dev "$dev3" -lvconvert -y --repair $vg/$lv1 -vgreduce --removemissing $vg -aux enable_dev "$dev3" -vgextend $vg "$dev3" -lvremove -ff $vg - -# RAID6 double replace -lvcreate --type raid5 -i 3 -l 2 -n $lv1 $vg \ - "$dev1" "$dev2" "$dev3" "$dev4" "$dev5" -aux wait_for_sync $vg $lv1 -aux disable_dev "$dev4" "$dev5" -lvconvert -y --repair $vg/$lv1 -vgreduce --removemissing $vg -aux enable_dev "$dev4" -aux enable_dev "$dev5" -vgextend $vg "$dev4" "$dev5" -lvremove -ff $vg +if aux target_at_least dm-raid 1 1 0; then + # RAID5 single replace + lvcreate --type raid5 -i 2 -l 2 -n $lv1 $vg "$dev1" "$dev2" "$dev3" + aux wait_for_sync $vg $lv1 + aux disable_dev "$dev3" + lvconvert -y --repair $vg/$lv1 + vgreduce --removemissing $vg + aux enable_dev "$dev3" + vgextend $vg "$dev3" + lvremove -ff $vg + + # RAID6 double replace + lvcreate --type raid5 -i 3 -l 2 -n $lv1 $vg \ + "$dev1" "$dev2" "$dev3" "$dev4" "$dev5" + aux wait_for_sync $vg $lv1 + aux disable_dev "$dev4" "$dev5" + lvconvert -y --repair $vg/$lv1 + vgreduce --removemissing $vg + aux enable_dev "$dev4" + aux enable_dev "$dev5" + vgextend $vg "$dev4" "$dev5" + lvremove -ff $vg +fi vgremove -ff $vg

1 0

master - locking: clarify read-only locking error message v2
by Peter Rajnoha 25 Jul '12

25 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=81e89c0647d856d3… Commit: 81e89c0647d856d328ac6ccc8db55472b5746181 Parent: a05ac836412f1a9ebc6bc90fe611ff6808d6d844 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Wed Jul 25 14:37:22 2012 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed Jul 25 14:37:22 2012 +0200 locking: clarify read-only locking error message v2 --- lib/locking/no_locking.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/locking/no_locking.c b/lib/locking/no_locking.c index 76d8f1f..53a5948 100644 --- a/lib/locking/no_locking.c +++ b/lib/locking/no_locking.c @@ -74,7 +74,7 @@ static int _readonly_lock_resource(struct cmd_context *cmd, (flags & LCK_SCOPE_MASK) == LCK_VG && !(flags & LCK_CACHE) && strcmp(resource, VG_GLOBAL)) { - log_error("Read-only locking configured via global/locking_type setting. " + log_error("Read-only locking type set. " "Write locks are prohibited."); return 0; }

1 0

master - locking: clarify read-only locking error message
by Peter Rajnoha 25 Jul '12

25 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=a05ac836412f1a9e… Commit: a05ac836412f1a9ebc6bc90fe611ff6808d6d844 Parent: 1b607890203911a0f92e8f5d5f55e60b52d746ad Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Wed Jul 25 14:06:02 2012 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Wed Jul 25 14:06:02 2012 +0200 locking: clarify read-only locking error message --- lib/locking/no_locking.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/locking/no_locking.c b/lib/locking/no_locking.c index cc57275..76d8f1f 100644 --- a/lib/locking/no_locking.c +++ b/lib/locking/no_locking.c @@ -74,7 +74,8 @@ static int _readonly_lock_resource(struct cmd_context *cmd, (flags & LCK_SCOPE_MASK) == LCK_VG && !(flags & LCK_CACHE) && strcmp(resource, VG_GLOBAL)) { - log_error("Write locks are prohibited with read-only locking."); + log_error("Read-only locking configured via global/locking_type setting. " + "Write locks are prohibited."); return 0; }

1 0

master - Forgot to update WHATS_NEW for commit 5555d2a000ed4e3d5a694896f3dc6a7290543f43
by Jonathan Brassow 24 Jul '12

24 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1b607890203911a0… Commit: 1b607890203911a0f92e8f5d5f55e60b52d746ad Parent: 5555d2a000ed4e3d5a694896f3dc6a7290543f43 Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Tue Jul 24 22:28:23 2012 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Tue Jul 24 22:28:23 2012 -0500 Forgot to update WHATS_NEW for commit 5555d2a000ed4e3d5a694896f3dc6a7290543f43 --- WHATS_NEW | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index aa26622..bca890e 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Fix segfault when attempting to replace RAID 4/5/6 device (2.02.97). Fix dumpconfig <node> to print only <node> without its siblings (2.02.89). Do not issue "Failed to handle a client connection" error if lvmetad killed. Support changing of discard and zeroing for thin pool.

1 0

master - RAID: Fix segfault when attempting to replace RAID 4/5/6 device
by Jonathan Brassow 24 Jul '12

24 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5555d2a000ed4e3d… Commit: 5555d2a000ed4e3d5a694896f3dc6a7290543f43 Parent: 407198e17dc805dd9ce0583c8b1dbade71572af6 Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Tue Jul 24 19:02:06 2012 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Tue Jul 24 19:02:06 2012 -0500 RAID: Fix segfault when attempting to replace RAID 4/5/6 device Commit 8767435ef847831455fadc1f7e8f4d2d94aef0d5 allowed RAID 4/5/6 LV to be extended properly, but introduced a regression in device replacement - a critical component of fault tolerance. When only 1 or 2 drives are being replaced, the 'area_count' needed can be equal to the parity_count. The 'area_multiple' for RAID 4/5/6 was computed as 'area_count - parity_devs', which could result in 'area_multiple' being 0. This would ultimately lead to a division by zero error. Therefore, in calc_area_multiple, it is important to take into account the number of areas that are being requested - just as we already do in _alloc_init. --- lib/metadata/lv_manip.c | 11 ++++++++++- test/shell/lvconvert-repair.sh | 26 +++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 0d89b4a..daa90da 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -698,8 +698,17 @@ static uint32_t _calc_area_multiple(const struct segment_type *segtype, return area_count; /* Parity RAID (e.g. RAID 4/5/6) */ - if (segtype_is_raid(segtype) && segtype->parity_devs) + if (segtype_is_raid(segtype) && segtype->parity_devs) { + /* + * As articulated in _alloc_init, we can tell by + * the area_count whether a replacement drive is + * being allocated; and if this is the case, then + * there is no area_multiple that should be used. + */ + if (area_count <= segtype->parity_devs) + return 1; return area_count - segtype->parity_devs; + } /* Mirrored stripes */ if (stripes) diff --git a/test/shell/lvconvert-repair.sh b/test/shell/lvconvert-repair.sh index 947998c..0aeeffa 100644 --- a/test/shell/lvconvert-repair.sh +++ b/test/shell/lvconvert-repair.sh @@ -23,7 +23,7 @@ aux lvmconf 'allocation/mirror_logs_require_separate_pvs = 1' # fail multiple devices # 4-way, disk log => 2-way, disk log -aux prepare_vg 5 +aux prepare_vg 8 lvcreate -m 3 --ig -L 1 -n 4way $vg "$dev1" "$dev2" "$dev3" "$dev4" "$dev5":0 aux disable_dev "$dev2" "$dev4" echo n | lvconvert --repair $vg/4way 2>&1 | tee 4way.out @@ -111,4 +111,28 @@ lvconvert -y --repair $vg/mirror vgreduce --removemissing $vg aux enable_dev "$dev3" vgextend $vg "$dev3" +lvremove -ff $vg + +# RAID5 single replace +lvcreate --type raid5 -i 2 -l 2 -n $lv1 $vg "$dev1" "$dev2" "$dev3" +aux wait_for_sync $vg $lv1 +aux disable_dev "$dev3" +lvconvert -y --repair $vg/$lv1 +vgreduce --removemissing $vg +aux enable_dev "$dev3" +vgextend $vg "$dev3" +lvremove -ff $vg + +# RAID6 double replace +lvcreate --type raid5 -i 3 -l 2 -n $lv1 $vg \ + "$dev1" "$dev2" "$dev3" "$dev4" "$dev5" +aux wait_for_sync $vg $lv1 +aux disable_dev "$dev4" "$dev5" +lvconvert -y --repair $vg/$lv1 +vgreduce --removemissing $vg +aux enable_dev "$dev4" +aux enable_dev "$dev5" +vgextend $vg "$dev4" "$dev5" +lvremove -ff $vg + vgremove -ff $vg

1 0

master - TEST: Replace old sync test/wait functions with new library functions
by Jonathan Brassow 24 Jul '12

24 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=407198e17dc805dd… Commit: 407198e17dc805dd9ce0583c8b1dbade71572af6 Parent: 753cb9204d24ceb4d9f8184ceb4c0262b9aacb42 Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Tue Jul 24 14:20:30 2012 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Tue Jul 24 14:20:30 2012 -0500 TEST: Replace old sync test/wait functions with new library functions Generic sync test/wait functions have replaced the old mirror/raid functions. --- test/shell/lvconvert-mirror.sh | 10 ++---- test/shell/lvconvert-raid.sh | 74 ++++----------------------------------- test/shell/lvcreate-raid.sh | 47 ++----------------------- 3 files changed, 15 insertions(+), 116 deletions(-) diff --git a/test/shell/lvconvert-mirror.sh b/test/shell/lvconvert-mirror.sh index 3f572e5..4d587d9 100644 --- a/test/shell/lvconvert-mirror.sh +++ b/test/shell/lvconvert-mirror.sh @@ -11,10 +11,6 @@ . lib/test -wait_for_mirror_in_sync_() { - while test $(get lv_field $1 copy_percent) != "100.00"; do sleep 1; done -} - aux prepare_pvs 5 10 # FIXME - test fails with extent size < 512k vgcreate -c n -s 512k $vg $(cat DEVICES) @@ -93,7 +89,7 @@ should not lvconvert -m-1 $vg/$lv1 "$dev1" lvconvert $vg/$lv1 # wait lvconvert -m2 $vg/$lv1 "$dev1" "$dev2" "$dev4" "$dev3:0" # If the above "should" failed... -wait_for_mirror_in_sync_ $vg/$lv1 +aux wait_for_sync $vg $lv1 lvconvert -m-1 $vg/$lv1 "$dev1" check mirror_images_on $lv1 "$dev2" "$dev4" lvconvert -m-1 $vg/$lv1 "$dev2" @@ -215,7 +211,7 @@ lvremove -ff $vg # "rhbz440405: lvconvert -m0 incorrectly fails if all PEs allocated" lvcreate -l`pvs --noheadings -ope_count "$dev1"` -m1 -n $lv1 $vg "$dev1" "$dev2" "$dev3:0" -wait_for_mirror_in_sync_ $vg/$lv1 +aux wait_for_sync $vg $lv1 lvconvert -m0 $vg/$lv1 "$dev1" check linear $vg $lv1 lvremove -ff $vg @@ -237,7 +233,7 @@ lvremove -ff $vg # BZ 463272: disk log mirror convert option is lost if downconvert option is also given lvcreate -l1 -m2 --corelog -n $lv1 $vg "$dev1" "$dev2" "$dev3" -wait_for_mirror_in_sync_ $vg/$lv1 +aux wait_for_sync $vg $lv1 lvconvert -m1 --mirrorlog disk $vg/$lv1 check mirror $vg $lv1 not check mirror $vg $lv1 core diff --git a/test/shell/lvconvert-raid.sh b/test/shell/lvconvert-raid.sh index a4ebac9..c63c141 100644 --- a/test/shell/lvconvert-raid.sh +++ b/test/shell/lvconvert-raid.sh @@ -11,65 +11,6 @@ . lib/test -# is_in_sync <VG/LV> -is_in_sync_() { - local a - local b - local idx - local dm_name=$(echo $1 | sed s:-:--: | sed s:/:-:) - - if ! a=(`dmsetup status $dm_name`); then - echo "Unable to get sync status of $1" - return 1 - elif [ ${a[2]} = "snapshot-origin" ]; then - if ! a=(`dmsetup status ${dm_name}-real`); then - echo "Unable to get sync status of $1" - return 1 - fi - fi - - # 6th argument is the sync ratio for RAID and mirror - if [ ${a[2]} = "raid" ]; then - # Last argument is the sync ratio for RAID - idx=$((${#a[@]} - 1)) - elif [ ${a[2]} = "mirror" ]; then - # 4th Arg tells us how far to the sync ratio - idx=$((${a[3]} + 4)) - else - echo "Unable to get sync ratio for target type '${a[2]}'" - return 1 - fi - b=( $(echo ${a[$idx]} | sed s:/:' ':) ) - - if [ ${b[0]} != ${b[1]} ]; then - echo "$dm_name (${a[3]}) is not in-sync" - return 1 - fi - - if [[ ${a[$(($idx - 1))]} =~ a ]]; then - echo "$dm_name in-sync, but 'a' characters in health status" - return 1 - fi - - if [ ${a[2]} = "raid" ]; then - echo "$dm_name (${a[3]}) is in-sync" - else - echo "$dm_name (${a[2]}) is in-sync" - fi -} - -# wait_for_sync <VG/LV> -wait_for_sync_() { - local i - for i in {1..100} ; do - is_in_sync_ $1 && return - sleep 1 - done - - echo "Sync is taking too long - assume stuck" - return 1 -} - ######################################################## # MAIN ######################################################## @@ -108,7 +49,7 @@ for i in 1 2 3 4; do lvcreate -l 2 -n $lv1 $vg else lvcreate --type raid1 -m $(($i - 1)) -l 2 -n $lv1 $vg - wait_for_sync_ $vg/$lv1 + aux wait_for_sync $vg $lv1 fi if $under_snap; then @@ -129,7 +70,7 @@ done # 3-way to 2-way convert while specifying devices lvcreate --type raid1 -m 2 -l 2 -n $lv1 $vg $dev1 $dev2 $dev3 -wait_for_sync_ $vg/$lv1 +aux wait_for_sync $vg $lv1 lvconvert -m1 $vg/$lv1 $dev2 lvremove -ff $vg @@ -142,7 +83,7 @@ lvremove -ff $vg ########################################### # 3-way to 2-way/linear lvcreate --type raid1 -m 2 -l 2 -n $lv1 $vg -wait_for_sync_ $vg/$lv1 +aux wait_for_sync $vg $lv1 lvconvert --splitmirrors 1 -n $lv2 $vg/$lv1 check lv_exists $vg $lv1 check linear $vg $lv2 @@ -151,7 +92,7 @@ lvremove -ff $vg # 2-way to linear/linear lvcreate --type raid1 -m 1 -l 2 -n $lv1 $vg -wait_for_sync_ $vg/$lv1 +aux wait_for_sync $vg $lv1 lvconvert --splitmirrors 1 -n $lv2 $vg/$lv1 check linear $vg $lv1 check linear $vg $lv2 @@ -160,8 +101,9 @@ lvremove -ff $vg # 3-way to linear/2-way lvcreate --type raid1 -m 2 -l 2 -n $lv1 $vg -wait_for_sync_ $vg/$lv1 +aux wait_for_sync $vg $lv1 # FIXME: Can't split off a RAID1 from a RAID1 yet +# 'should' results in "warnings" should lvconvert --splitmirrors 2 -n $lv2 $vg/$lv1 #check linear $vg $lv1 #check lv_exists $vg $lv2 @@ -173,7 +115,7 @@ lvremove -ff $vg ########################################### # 3-way to 2-way/linear lvcreate --type raid1 -m 2 -l 2 -n $lv1 $vg -wait_for_sync_ $vg/$lv1 +aux wait_for_sync $vg $lv1 lvconvert --splitmirrors 1 --trackchanges $vg/$lv1 check lv_exists $vg $lv1 check linear $vg ${lv1}_rimage_2 @@ -186,7 +128,7 @@ lvremove -ff $vg ########################################### for i in 1 2 3 ; do lvcreate --type mirror -m $i -l 2 -n $lv1 $vg - wait_for_sync_ $vg/$lv1 + aux wait_for_sync $vg $lv1 lvconvert --type raid1 $vg/$lv1 lvremove -ff $vg done diff --git a/test/shell/lvcreate-raid.sh b/test/shell/lvcreate-raid.sh index b6792c5..c26f694 100644 --- a/test/shell/lvcreate-raid.sh +++ b/test/shell/lvcreate-raid.sh @@ -11,45 +11,6 @@ . lib/test -# is_raid_in_sync <VG/LV> -function is_raid_in_sync() -{ - local dm_name=$(echo $1 | sed s:-:--: | sed s:/:-:) - local a - local b - local idx - - if ! a=(`dmsetup status $dm_name`); then - echo "Unable to get sync status of $1" - exit 1 - fi - idx=$((${#a[@]} - 1)) - b=(`echo ${a[$idx]} | sed s:/:' ':`) - - if [ ${b[0]} != ${b[1]} ]; then - echo "$dm_name (${a[3]}) is not in-sync" - return 1 - fi - - echo "$dm_name (${a[3]}) is in-sync" - return 0 -} - -# wait_for_raid_sync <VG/LV> -function wait_for_raid_sync() -{ - local i=0 - - while ! is_raid_in_sync $1; do - sleep 1 - i=$(($i + 1)) - if [ $i -gt 500 ]; then - echo "Sync is taking too long - assume stuck" - exit 1 - fi - done -} - ######################################################## # MAIN ######################################################## @@ -64,17 +25,17 @@ vgcreate -c n -s 512k $vg $(cat DEVICES) # Create RAID1 (implicit 2-way) lvcreate --type raid1 -l 2 -n $lv1 $vg -wait_for_raid_sync $vg/$lv1 +aux wait_for_sync $vg $lv1 lvremove -ff $vg # Create RAID1 (explicit 2-way) lvcreate --type raid1 -m 1 -l 2 -n $lv1 $vg -wait_for_raid_sync $vg/$lv1 +aux wait_for_sync $vg $lv1 lvremove -ff $vg # Create RAID1 (explicit 3-way) lvcreate --type raid1 -m 2 -l 2 -n $lv1 $vg -wait_for_raid_sync $vg/$lv1 +aux wait_for_sync $vg $lv1 lvremove -ff $vg # Create RAID 4/5/6 (explicit 3-stripe + parity devs) @@ -83,7 +44,7 @@ for i in raid4 \ raid6 raid6_zr raid6_nr raid6_nc; do lvcreate --type $i -l 3 -i 3 -n $lv1 $vg - wait_for_raid_sync $vg/$lv1 + aux wait_for_sync $vg $lv1 lvremove -ff $vg done

1 0

master - TEST: Add library functions for checking and waiting for sync
by Jonathan Brassow 24 Jul '12

24 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=753cb9204d24ceb4… Commit: 753cb9204d24ceb4d9f8184ceb4c0262b9aacb42 Parent: 5e36b86c46f04eddae2d4b1f826e1f24995b3636 Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Tue Jul 24 14:17:54 2012 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Tue Jul 24 14:17:54 2012 -0500 TEST: Add library functions for checking and waiting for sync Add 'in_sync' and 'wait_for_sync' to test and wait for synchronization of a mirror or RAID logical volume. --- test/lib/aux.sh | 12 ++++++++++++ test/lib/check.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 91f54c9..4128f30 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -479,6 +479,18 @@ udev_wait() { fi } +# wait_for_sync <VG/LV> +wait_for_sync() { + local i + for i in {1..500} ; do + check in_sync $1 $2 && return + sleep .2 + done + + echo "Sync is taking too long - assume stuck" + return 1 +} + # # Check wheter kernel [dm module] target exist # at least in expected version diff --git a/test/lib/check.sh b/test/lib/check.sh index 9c78728..95bba4b 100644 --- a/test/lib/check.sh +++ b/test/lib/check.sh @@ -151,6 +151,51 @@ linear() { $(lvl $lv -o+devices) } +# in_sync <VG> <LV> +# Works for "mirror" and "raid*" +in_sync() { + local a + local b + local idx + local type + local lvm_name="$1/$2" + local dm_name=$(echo $lvm_name | sed s:-:--: | sed s:/:-:) + + if ! a=(`dmsetup status $dm_name`); then + die "Unable to get sync status of $1" + elif [ ${a[2]} = "snapshot-origin" ]; then + if ! a=(`dmsetup status ${dm_name}-real`); then + die "Unable to get sync status of $1" + fi + fi + + if [ ${a[2]} = "raid" ]; then + # Last argument is the sync ratio for RAID + idx=$((${#a[@]} - 1)) + type=${a[3]} + elif [ ${a[2]} = "mirror" ]; then + # 4th Arg tells us how far to the sync ratio + idx=$((${a[3]} + 4)) + type=${a[2]} + else + die "Unable to get sync ratio for target type '${a[2]}'" + fi + + b=( $(echo ${a[$idx]} | sed s:/:' ':) ) + + if [ ${b[0]} != ${b[1]} ]; then + echo "$lvm_name ($type) is not in-sync" + return 1 + fi + + if [[ ${a[$(($idx - 1))]} =~ a ]]; then + die "$lvm_name in-sync, but 'a' characters in health status" + fi + + echo "$lvm_name ($type) is in-sync" + return 0 +} + active() { local lv=$1/$2 (get lv_field $lv attr | grep "^....a...$" >/dev/null) || \

1 0

master - config: fix one-node dumpconfig, add dm_config_write_one_node
by Peter Rajnoha 20 Jul '12

20 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=5e36b86c46f04edd… Commit: 5e36b86c46f04eddae2d4b1f826e1f24995b3636 Parent: 8d5ae472e5226f87175d51722fb5942c531bb8bb Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri Jul 20 15:53:04 2012 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Fri Jul 20 15:53:04 2012 +0200 config: fix one-node dumpconfig, add dm_config_write_one_node A regression introduced in 2.02.89 (11e520256b3005ed813ce83f8770aaab74edef3f) caused the lvm dumpconfig <node> to print out the node as well as its subsequent siblings. The information about "only_one" mode got lost. Before this patch (just an example node): # lvm dumpconfig global/use_lvmetad use_lvmetad=1 thin_check_executable="/usr/sbin/thin_check" thin_check_options="-q" (...all nodes to the end of the section) With this patch applied: # lvm dumpconfig global/use_lvmetad use_lvmetad=1 --- WHATS_NEW | 1 + WHATS_NEW_DM | 1 + lib/config/config.c | 2 +- libdm/libdevmapper.h | 3 +++ libdm/libdm-config.c | 15 +++++++++++++-- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 4f23c39..aa26622 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Fix dumpconfig <node> to print only <node> without its siblings (2.02.89). Do not issue "Failed to handle a client connection" error if lvmetad killed. Support changing of discard and zeroing for thin pool. Report used discard for thin pool and volume. diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 416beca..0bfd016 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.76 - =============================== + Add dm_config_write_one_node to libdevmapper. Add support for thin pool message release/reserve_metadata_snap. Add support for thin pool discard and external origin. Add configure --enable-udev-rule-exec-detection to detect exec path in rules. diff --git a/lib/config/config.c b/lib/config/config.c index 67a8b04..60ae6c8 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -473,7 +473,7 @@ int config_write(struct dm_config_tree *cft, const char *file, } } else while (argc--) { if ((cn = dm_config_find_node(cft->root, *argv))) { - if (!dm_config_write_node(cn, _putline_fn, fp)) { + if (!dm_config_write_one_node(cn, _putline_fn, fp)) { log_error("Failure while writing to %s", file); r = 0; } diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 549a635..02bf421 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -1488,7 +1488,10 @@ struct dm_config_tree *dm_config_remove_cascaded_tree(struct dm_config_tree *cft void dm_config_destroy(struct dm_config_tree *cft); typedef int (*dm_putline_fn)(const char *line, void *baton); +/* Write the node and any subsequent siblings it has. */ int dm_config_write_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton); +/* Write given node only without subsequent siblings. */ +int dm_config_write_one_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton); struct dm_config_node *dm_config_find_node(const struct dm_config_node *cn, const char *path); int dm_config_has_node(const struct dm_config_node *cn, const char *path); diff --git a/libdm/libdm-config.c b/libdm/libdm-config.c index d9d3882..8457497 100644 --- a/libdm/libdm-config.c +++ b/libdm/libdm-config.c @@ -331,14 +331,15 @@ static int _write_config(const struct dm_config_node *n, int only_one, return 1; } -int dm_config_write_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton) +static int _write_node(const struct dm_config_node *cn, int only_one, + dm_putline_fn putline, void *baton) { struct output_line outline; if (!(outline.mem = dm_pool_create("config_line", 1024))) return_0; outline.putline = putline; outline.putline_baton = baton; - if (!_write_config(cn, 0, &outline, 0)) { + if (!_write_config(cn, only_one, &outline, 0)) { dm_pool_destroy(outline.mem); return_0; } @@ -346,6 +347,16 @@ int dm_config_write_node(const struct dm_config_node *cn, dm_putline_fn putline, return 1; } +int dm_config_write_one_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton) +{ + return _write_node(cn, 1, putline, baton); +} + +int dm_config_write_node(const struct dm_config_node *cn, dm_putline_fn putline, void *baton) +{ + return _write_node(cn, 0, putline, baton); +} + /* * parser

1 0

master - daemon-server: fix error message on daemon shutdown
by Peter Rajnoha 19 Jul '12

19 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8d5ae472e5226f87… Commit: 8d5ae472e5226f87175d51722fb5942c531bb8bb Parent: 48367c5be9b39cd118caeb6b8e554be347d2fd8c Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Thu Jul 19 16:45:08 2012 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Thu Jul 19 16:45:08 2012 +0200 daemon-server: fix error message on daemon shutdown If a daemon (like lvmetad that is using common daemon-server code) received a kill signal that was supposed to shut the daemon down, a spurious message was issued: "Failed to handle a client connection". This happened if the kill signal came just in the middle of waiting for a client request in "select" - the request that was supposed to be handled was blank at that moment of course. --- WHATS_NEW | 1 + libdaemon/server/daemon-server.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 925ae23..4f23c39 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Do not issue "Failed to handle a client connection" error if lvmetad killed. Support changing of discard and zeroing for thin pool. Report used discard for thin pool and volume. Add support for controlling discard behavior of thin pool. diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c index 65b28e4..5ca9231 100644 --- a/libdaemon/server/daemon-server.c +++ b/libdaemon/server/daemon-server.c @@ -510,7 +510,7 @@ void daemon_start(daemon_state s) if (select(FD_SETSIZE, &in, NULL, NULL, NULL) < 0 && errno != EINTR) perror("select error"); if (FD_ISSET(s.socket_fd, &in)) - if (!handle_connect(s)) + if (!_shutdown_requested && !handle_connect(s)) syslog(LOG_ERR, "Failed to handle a client connection."); }

1 0

master - thin: add lvchange for discard and zero change
by Zdenek Kabelac 18 Jul '12

18 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=48367c5be9b39cd1… Commit: 48367c5be9b39cd118caeb6b8e554be347d2fd8c Parent: 46b9cc1248941cc43f953e1a6b285ebe64a62077 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 28 14:52:23 2012 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Jul 18 14:38:34 2012 +0200 thin: add lvchange for discard and zero change Update lvchange to allow change of 'zero' flag for thinpool. Add support for changing discard handling. N.B. from/to ignore could be only changed for inactive pool. --- WHATS_NEW | 1 + man/lvchange.8.in | 14 ++++++++- tools/commands.h | 7 +++- tools/lvchange.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 106 insertions(+), 4 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 7811b6d..925ae23 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Support changing of discard and zeroing for thin pool. Report used discard for thin pool and volume. Add support for controlling discard behavior of thin pool. Detect features for new 1.1 thin pool target. diff --git a/man/lvchange.8.in b/man/lvchange.8.in index bf9ef48..beb77a8 100644 --- a/man/lvchange.8.in +++ b/man/lvchange.8.in @@ -16,6 +16,8 @@ lvchange \- change attributes of a logical volume .RB [ \-d | \-\-debug ] .RB [ \-\-deltag .IR Tag ] +.RB [ \-\-discard +.RI { ignore | nopassdown | passdown }] .RB [ \-\-resync ] .RB [ \-h | \-? | \-\-help ] .RB [ \-\-ignorelockingfailure ] @@ -37,7 +39,9 @@ lvchange \- change attributes of a logical volume .RI { ReadAheadSectors | auto | none }] .RB [ \-\-refresh ] .RB [ \-t | \-\-test ] -.RB [ \-v | \-\-verbose] +.RB [ \-v | \-\-verbose ] +.RB [ \-Z | \-\-zero +.RI { y | n }] .I LogicalVolumePath .RI [ LogicalVolumePath ...] .SH DESCRIPTION @@ -68,6 +72,9 @@ logical volumes. It's only possible to change a non-contiguous logical volume's allocation policy to contiguous, if all of the allocated physical extents are already contiguous. .TP +.BR \-\-discard " {" \fIignore | \fInopassdown | \fIpassdown } +Change discard behavior. +.TP .B \-\-resync Forces the complete resynchronization of a mirror. In normal circumstances you should not need this option because synchronization @@ -142,6 +149,11 @@ If the logical volume is active, reload its metadata. This is not necessary in normal operation, but may be useful if something has gone wrong or if you're doing clustering manually without a clustered lock manager. +.TP +.BR \-Z ", " \-\-zero " {" \fIy | \fIn } +Set zeroing mode for thin pool. Note: already provisioned blocks from pool +in non-zero mode are not cleared in unwritten parts when setting zero to +\fIy\fP. .SH Examples Changes the permission on volume lvol1 in volume group vg00 to be read-only: .sp diff --git a/tools/commands.h b/tools/commands.h index fe7403d..88c170a 100644 --- a/tools/commands.h +++ b/tools/commands.h @@ -69,6 +69,7 @@ xx(lvchange, "\t[--deltag Tag]\n" "\t[-f|--force]\n" "\t[-h|--help]\n" + "\t[--discard {ignore|nopassdown|passdown}]\n" "\t[--ignorelockingfailure]\n" "\t[--ignoremonitoring]\n" "\t[--monitor {y|n}]\n" @@ -84,14 +85,16 @@ xx(lvchange, "\t[-t|--test]\n" "\t[-v|--verbose]\n" "\t[-y|--yes]\n" - "\t[--version]" "\n" + "\t[--version]\n" + "\t[-Z|--zero {y|n}]\n" "\tLogicalVolume[Path] [LogicalVolume[Path]...]\n", alloc_ARG, autobackup_ARG, activate_ARG, available_ARG, contiguous_ARG, force_ARG, ignorelockingfailure_ARG, ignoremonitoring_ARG, major_ARG, minor_ARG, monitor_ARG, noudevsync_ARG, partial_ARG, permission_ARG, persistent_ARG, poll_ARG, readahead_ARG, resync_ARG, refresh_ARG, - addtag_ARG, deltag_ARG, sysinit_ARG, test_ARG, yes_ARG) + addtag_ARG, deltag_ARG, sysinit_ARG, test_ARG, yes_ARG, + discard_ARG, zero_ARG) xx(lvconvert, "Change logical volume layout", diff --git a/tools/lvchange.c b/tools/lvchange.c index 9054ac7..a24d26c 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -89,6 +89,77 @@ out: return r; } +static int lvchange_pool_update(struct cmd_context *cmd, + struct logical_volume *lv) +{ + int r = 0; + int update = 0; + unsigned val; + thin_discard_t discard; + + if (!lv_is_thin_pool(lv)) { + log_error("Logical volume \"%s\" is not a thinpool.", lv->name); + return 0; + } + + if (arg_count(cmd, discard_ARG)) { + discard = arg_uint_value(cmd, discard_ARG, 0); + if (discard != first_seg(lv)->discard) { + if (((discard == THIN_DISCARD_IGNORE) || + (first_seg(lv)->discard == THIN_DISCARD_IGNORE)) && + lv_is_active(lv)) + log_error("Cannot change discard state for active " + "logical volume \"%s\".", lv->name); + else { + first_seg(lv)->discard = discard; + update++; + } + } else + log_error("Logical volume \"%s\" already uses discard %s.", + lv->name, get_pool_discard_name(discard)); + } + + if (arg_count(cmd, zero_ARG)) { + val = arg_uint_value(cmd, zero_ARG, 1); + if (val != first_seg(lv)->zero_new_blocks) { + first_seg(lv)->zero_new_blocks = val; + update++; + } else + log_error("Logical volume \"%s\" already %szero new blocks.", + lv->name, val ? "" : "does not "); + } + + if (!update) + return 0; + + log_very_verbose("Updating logical volume \"%s\" on disk(s).", lv->name); + if (!vg_write(lv->vg)) + return_0; + + if (!suspend_lv_origin(cmd, lv)) { + log_error("Failed to update active %s/%s (deactivation is needed).", + lv->vg->name, lv->name); + vg_revert(lv->vg); + goto out; + } + + if (!vg_commit(lv->vg)) { + if (!resume_lv_origin(cmd, lv)) + stack; + goto_out; + } + + if (!resume_lv_origin(cmd, lv)) { + log_error("Problem reactivating %s.", lv->name); + goto out; + } + + r = 1; +out: + backup(lv->vg); + return r; +} + static int lvchange_monitoring(struct cmd_context *cmd, struct logical_volume *lv) { @@ -545,6 +616,8 @@ static int lvchange_single(struct cmd_context *cmd, struct logical_volume *lv, if (!(lv->vg->status & LVM_WRITE) && (arg_count(cmd, contiguous_ARG) || arg_count(cmd, permission_ARG) || arg_count(cmd, readahead_ARG) || arg_count(cmd, persistent_ARG) || + arg_count(cmd, discard_ARG) || + arg_count(cmd, zero_ARG) || arg_count(cmd, alloc_ARG))) { log_error("Only -a permitted with read-only volume " "group \"%s\"", lv->vg->name); @@ -670,6 +743,17 @@ static int lvchange_single(struct cmd_context *cmd, struct logical_volume *lv, } } + if (arg_count(cmd, discard_ARG) || + arg_count(cmd, zero_ARG)) { + if (!archived && !archive(lv->vg)) { + stack; + return ECMD_FAILED; + } + archived = 1; + doit += lvchange_pool_update(cmd, lv); + docmds++; + } + /* add tag */ if (arg_count(cmd, addtag_ARG)) { if (!archived && !archive(lv->vg)) { @@ -747,7 +831,9 @@ int lvchange(struct cmd_context *cmd, int argc, char **argv) arg_count(cmd, contiguous_ARG) || arg_count(cmd, permission_ARG) || arg_count(cmd, readahead_ARG) || arg_count(cmd, persistent_ARG) || arg_count(cmd, addtag_ARG) || arg_count(cmd, deltag_ARG) || - arg_count(cmd, resync_ARG) || arg_count(cmd, alloc_ARG); + arg_count(cmd, resync_ARG) || arg_count(cmd, alloc_ARG) || + arg_count(cmd, discard_ARG) || + arg_count(cmd, zero_ARG); if (!update && !arg_count(cmd, activate_ARG) && !arg_count(cmd, refresh_ARG) &&

1 0

master - thin: add reporting of discard for thin pool
by Zdenek Kabelac 18 Jul '12

18 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=46b9cc1248941cc4… Commit: 46b9cc1248941cc43f953e1a6b285ebe64a62077 Parent: ebbf7d8e68f37c1a1e448a07676cca0a6e7f1430 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Mon Jul 9 16:48:28 2012 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Jul 18 14:37:44 2012 +0200 thin: add reporting of discard for thin pool New field "discard" is added for lvs reporting of lv segment. Reported as one character: (i)gnore (n)opassdown (p)assdown lvs -o+discard --- WHATS_NEW | 1 + lib/report/columns.h | 1 + lib/report/properties.c | 2 ++ lib/report/report.c | 30 ++++++++++++++++++++++++++++++ man/lvs.8.in | 1 + 5 files changed, 35 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 41b52be..7811b6d 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Report used discard for thin pool and volume. Add support for controlling discard behavior of thin pool. Detect features for new 1.1 thin pool target. Count percentage of completeness upwards when merging a snapshot volume. diff --git a/lib/report/columns.h b/lib/report/columns.h index 579f029..7bcaaab 100644 --- a/lib/report/columns.h +++ b/lib/report/columns.h @@ -140,6 +140,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, "Dis", list, 3, discard, discard, "For thin pools, discard handling (i)ignore, (n)o_passdown, (p)assdown.", 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 0855f95..d78ad64 100644 --- a/lib/report/properties.c +++ b/lib/report/properties.c @@ -277,6 +277,8 @@ 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(discard, lvseg->discard) +#define _discard_set _not_implemented_set GET_LVSEG_NUM_PROPERTY_FN(seg_start, lvseg_start(lvseg)) #define _seg_start_set _not_implemented_set GET_LVSEG_NUM_PROPERTY_FN(seg_start_pe, lvseg->le) diff --git a/lib/report/report.c b/lib/report/report.c index 97e75b6..3121db3 100644 --- a/lib/report/report.c +++ b/lib/report/report.c @@ -564,6 +564,36 @@ static int _transactionid_disp(struct dm_report *rh, struct dm_pool *mem, return dm_report_field_uint64(rh, field, &seg->transaction_id); } +static int _discard_disp(struct dm_report *rh, struct dm_pool *mem, + struct dm_report_field *field, + const void *data, void *private) +{ + static const struct { + const char c[2]; + unsigned val; + thin_discard_t discard; + } const arr[] = { + { "p", 0, THIN_DISCARD_PASSDOWN }, + { "n", 1, THIN_DISCARD_NO_PASSDOWN }, + { "i", 2, THIN_DISCARD_IGNORE }, + { "" } + }; + const struct lv_segment *seg = (const struct lv_segment *) data; + unsigned i = 0; + + if (seg_is_thin_volume(seg)) + seg = first_seg(seg->pool_lv); + + if (seg_is_thin_pool(seg)) { + while (arr[i].c[0] && seg->discard != arr[i].discard) + i++; + + dm_report_field_set_value(field, arr[i].c, &arr[i].val); + } else + dm_report_field_set_value(field, "", NULL); + + return 1; +} static int _originsize_disp(struct dm_report *rh, struct dm_pool *mem, struct dm_report_field *field, diff --git a/man/lvs.8.in b/man/lvs.8.in index 9a4bb4d..f492835 100644 --- a/man/lvs.8.in +++ b/man/lvs.8.in @@ -80,6 +80,7 @@ convert_lv, copy_percent, data_lv, devices, +discard, lv_attr, lv_host, lv_kernel_major,

1 0

master - thin: add discard support for thin pool
by Zdenek Kabelac 18 Jul '12

18 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=ebbf7d8e68f37c1a… Commit: ebbf7d8e68f37c1a1e448a07676cca0a6e7f1430 Parent: 260e8f24768d7a6e7c6a8018b5c2b08e7a35e35c Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Thu Jun 28 14:47:34 2012 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Jul 18 14:36:57 2012 +0200 thin: add discard support for thin pool Add arg support for discard. Add discard ignore, nopassdown, passdown (=default) support. Flags could be set per pool. lvcreate [--discard {ignore|no_passdown|passdown}] vg/thinlv --- WHATS_NEW | 1 + lib/metadata/metadata-exported.h | 9 +++++++ lib/metadata/thin_manip.c | 35 ++++++++++++++++++++++++++++++ lib/thin/thin.c | 44 ++++++++++++++++++++++++++++++++++++++ man/lvcreate.8.in | 6 +++++ tools/args.h | 1 + tools/commands.h | 6 ++++- tools/lvmcmdline.c | 13 +++++++++++ tools/tools.h | 1 + 9 files changed, 115 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 54ae73b..41b52be 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Add support for controlling discard behavior of thin pool. Detect features for new 1.1 thin pool target. Count percentage of completeness upwards when merging a snapshot volume. Skip activation when using vg/lvchange --sysinit -a ay and lvmetad is active. diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index 8c655c7..d2afdb1 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -166,6 +166,12 @@ typedef enum { DONT_PROMPT_OVERRIDE = 2 /* Skip prompt + override a second condition */ } force_t; +typedef enum { + THIN_DISCARD_PASSDOWN, + THIN_DISCARD_NO_PASSDOWN, + THIN_DISCARD_IGNORE, +} thin_discard_t; + struct cmd_context; struct format_handler; struct labeller; @@ -347,6 +353,7 @@ struct lv_segment { uint64_t transaction_id; /* For thin_pool, thin */ uint64_t low_water_mark; /* For thin_pool */ unsigned zero_new_blocks; /* For thin_pool */ + thin_discard_t discard; /* For thin_pool */ struct dm_list thin_messages; /* For thin_pool */ struct logical_volume *pool_lv; /* For thin */ uint32_t device_id; /* For thin, 24bit */ @@ -558,6 +565,8 @@ uint64_t extents_from_size(struct cmd_context *cmd, uint64_t size, uint32_t extent_size); int update_pool_lv(struct logical_volume *lv, int activate); +int get_pool_discard(const char *str, thin_discard_t *discard); +const char *get_pool_discard_name(thin_discard_t discard); /* * Activation options diff --git a/lib/metadata/thin_manip.c b/lib/metadata/thin_manip.c index ae8d509..8d1744c 100644 --- a/lib/metadata/thin_manip.c +++ b/lib/metadata/thin_manip.c @@ -428,3 +428,38 @@ int update_pool_lv(struct logical_volume *lv, int activate) return 1; } + +int get_pool_discard(const char *str, thin_discard_t *discard) +{ + if (!strcasecmp(str, "passdown")) + *discard = THIN_DISCARD_PASSDOWN; + /* Allow some variation in thin parameter */ + else if (!strcasecmp(str, "nopassdown") || + !strcasecmp(str, "no-passdown") || + !strcasecmp(str, "no_passdown")) + *discard = THIN_DISCARD_NO_PASSDOWN; + else if (!strcasecmp(str, "ignore")) + *discard = THIN_DISCARD_IGNORE; + else { + log_error("Thin pool discard type %s is unknown.", str); + return 0; + } + + return 1; +} + +const char *get_pool_discard_name(thin_discard_t discard) +{ + switch (discard) { + case THIN_DISCARD_PASSDOWN: + return "passdown"; + case THIN_DISCARD_NO_PASSDOWN: + return "nopassdown"; + case THIN_DISCARD_IGNORE: + return "ignore"; + } + + log_error(INTERNAL_ERROR "Uknown discard type."); + + return NULL; +} diff --git a/lib/thin/thin.c b/lib/thin/thin.c index 974293c..27ce6f5 100644 --- a/lib/thin/thin.c +++ b/lib/thin/thin.c @@ -39,6 +39,10 @@ log_error(t " segment %s of logical volume %s.", ## p, \ dm_config_parent_name(sn), seg->lv->name), 0; +static int _thin_target_present(struct cmd_context *cmd, + const struct lv_segment *seg, + unsigned *attributes); + static const char *_thin_pool_name(const struct lv_segment *seg) { return seg->segtype->name; @@ -83,6 +87,7 @@ static int _thin_pool_text_import(struct lv_segment *seg, { const char *lv_name; struct logical_volume *pool_data_lv, *pool_metadata_lv; + const char *discard = NULL; if (!dm_config_get_str(sn, "metadata", &lv_name)) return SEG_LOG_ERROR("Metadata must be a string in"); @@ -109,6 +114,15 @@ static int _thin_pool_text_import(struct lv_segment *seg, if (!dm_config_get_uint32(sn, "chunk_size", &seg->chunk_size)) return SEG_LOG_ERROR("Could not read chunk_size"); + if (dm_config_has_node(sn, "discard") && + !dm_config_get_str(sn, "discard", &discard)) + return SEG_LOG_ERROR("Could not read discard for"); + + if (!discard) + seg->discard = THIN_DISCARD_PASSDOWN; + else if (!get_pool_discard(discard, &seg->discard)) + return SEG_LOG_ERROR("Discard option unsupported for"); + if (dm_config_has_node(sn, "low_water_mark") && !dm_config_get_uint64(sn, "low_water_mark", &seg->low_water_mark)) return SEG_LOG_ERROR("Could not read low_water_mark"); @@ -149,6 +163,19 @@ static int _thin_pool_text_export(const struct lv_segment *seg, struct formatter outsize(f, (uint64_t) seg->chunk_size, "chunk_size = %u", seg->chunk_size); + switch (seg->discard) { + case THIN_DISCARD_PASSDOWN: + /* nothing to do */ + break; + case THIN_DISCARD_NO_PASSDOWN: + case THIN_DISCARD_IGNORE: + outf(f, "discard = \"%s\"", get_pool_discard_name(seg->discard)); + break; + default: + log_error(INTERNAL_ERROR "Unexportable discard."); + return 0; + } + if (seg->low_water_mark) outf(f, "low_water_mark = %" PRIu64, seg->low_water_mark); @@ -207,11 +234,16 @@ static int _thin_pool_add_target_line(struct dev_manager *dm, struct dm_tree_node *node, uint64_t len, uint32_t *pvmove_mirror_count __attribute__((unused))) { + static int _no_discard = 0; char *metadata_dlid, *pool_dlid; const struct lv_thin_message *lmsg; const struct logical_volume *origin; struct lvinfo info; uint64_t transaction_id = 0; + unsigned attr; + + if (!_thin_target_present(cmd, seg, &attr)) + return_0; if (!laopts->real_pool) { if (!(pool_dlid = build_dm_uuid(mem, seg->lv->lvid.s, "tpool"))) { @@ -246,6 +278,18 @@ static int _thin_pool_add_target_line(struct dev_manager *dm, seg->zero_new_blocks ? 0 : 1)) return_0; + if (seg->discard != THIN_DISCARD_PASSDOWN) { + if (attr & THIN_FEATURE_DISCARD) { + /* FIXME: Check whether underlaying dev supports discard */ + if (!dm_tree_node_set_thin_pool_discard(node, + seg->discard == THIN_DISCARD_IGNORE, + seg->discard == THIN_DISCARD_NO_PASSDOWN)) + return_0; + } else + log_warn_suppress(_no_discard++, "WARNING: Thin pool target does " + "not support discard (needs kernel >= 3.4)."); + } + /* * Add messages only for activation tree. * Otherwise avoid checking for existence of suspended origin. diff --git a/man/lvcreate.8.in b/man/lvcreate.8.in index 2917775..1911605 100644 --- a/man/lvcreate.8.in +++ b/man/lvcreate.8.in @@ -54,6 +54,8 @@ lvcreate \- create a logical volume in an existing volume group .RB [ \-T | \-\-thin .RB [ \-c | \-\-chunksize .IR ChunkSize ] +.RB [ \-\-discard +.RI { ignore | nopassdown | passdown }] .RB [ \-\-poolmetadatasize .IR MetadataSize [ bBsSkKmMgG ]]] .RB [ \-\-thinpool @@ -138,6 +140,10 @@ Sets or resets the contiguous allocation policy for logical volumes. Default is no contiguous allocation based on a next free principle. .TP +.BR \-\-discard " {" \fIignore | \fInopassdown | \fIpassdown } +Set discard behavior. +Default is \fIpassdown\fP. +.TP .BR \-i ", " \-\-stripes " " \fIStripes Gives the number of stripes. This is equal to the number of physical volumes to scatter diff --git a/tools/args.h b/tools/args.h index 2ce3c36..4909f9e 100644 --- a/tools/args.h +++ b/tools/args.h @@ -72,6 +72,7 @@ arg(virtualoriginsize_ARG, '\0', "virtualoriginsize", size_mb_arg, 0) arg(noudevsync_ARG, '\0', "noudevsync", NULL, 0) arg(poll_ARG, '\0', "poll", yes_no_arg, 0) arg(poolmetadatasize_ARG, '\0', "poolmetadatasize", size_mb_arg, 0) +arg(discard_ARG, '\0', "discard", discard_arg, 0) 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 3454951..fe7403d 100644 --- a/tools/commands.h +++ b/tools/commands.h @@ -177,6 +177,10 @@ xx(lvcreate, "\t[-p|--permission {r|rw}]\n" "\t[-r|--readahead ReadAheadSectors|auto|none]\n" "\t[-R|--regionsize MirrorLogRegionSize]\n" + "\t[-T|--thin [-c|--chunksize ChunkSize]\n" + "\t [--discard {ignore|nopassdown|passdown}]\n" + "\t [--poolmetadatasize MetadataSize[bBsSkKmMgG]]]\n" + "\t[--thinpool ThinPoolLogicalVolume{Name|Path}]\n" "\t[-t|--test]\n" "\t[--type VolumeType]\n" "\t[-v|--verbose]\n" @@ -215,7 +219,7 @@ xx(lvcreate, "\t[PhysicalVolumePath...]\n\n", addtag_ARG, alloc_ARG, autobackup_ARG, activate_ARG, available_ARG, - chunksize_ARG, contiguous_ARG, corelog_ARG, extents_ARG, + chunksize_ARG, contiguous_ARG, corelog_ARG, extents_ARG, discard_ARG, ignoremonitoring_ARG, major_ARG, minor_ARG, mirrorlog_ARG, mirrors_ARG, monitor_ARG, name_ARG, nosync_ARG, noudevsync_ARG, permission_ARG, persistent_ARG, readahead_ARG, regionsize_ARG, size_ARG, snapshot_ARG, diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 16e15a1..0e6a51c 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -216,6 +216,19 @@ int activation_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_v return 1; } +int discard_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av) +{ + thin_discard_t discard; + + if (!get_pool_discard(av->value, &discard)) + return_0; + + av->i_value = discard; + av->ui_value = discard; + + return 1; +} + int metadatatype_arg(struct cmd_context *cmd, struct arg_values *av) { return get_format_by_name(cmd, av->value) ? 1 : 0; diff --git a/tools/tools.h b/tools/tools.h index 7a44651..f92abd5 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -139,6 +139,7 @@ void usage(const char *name); /* the argument verify/normalise functions */ int yes_no_arg(struct cmd_context *cmd, struct arg_values *av); int activation_arg(struct cmd_context *cmd, struct arg_values *av); +int discard_arg(struct cmd_context *cmd, struct arg_values *av); int size_kb_arg(struct cmd_context *cmd, struct arg_values *av); int size_mb_arg(struct cmd_context *cmd, struct arg_values *av); int int_arg(struct cmd_context *cmd, struct arg_values *av);

1 0

master - thin: detect supported features from thinp target
by Zdenek Kabelac 18 Jul '12

18 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=260e8f24768d7a6e… Commit: 260e8f24768d7a6e7c6a8018b5c2b08e7a35e35c Parent: c4db22bd4f3d4a7328b2e03c27a5c1edb167d47f Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Fri May 25 13:38:03 2012 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Jul 18 14:35:17 2012 +0200 thin: detect supported features from thinp target Add shell variable to override reported min version for testing: LVM_THIN_VERSION_MIN --- WHATS_NEW | 1 + lib/activate/activate.h | 9 +++++++++ lib/thin/thin.c | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 1 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index f20f4fb..54ae73b 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Detect features for new 1.1 thin pool target. Count percentage of completeness upwards when merging a snapshot volume. Skip activation when using vg/lvchange --sysinit -a ay and lvmetad is active. Fix extending RAID 4/5/6 logical volumes diff --git a/lib/activate/activate.h b/lib/activate/activate.h index f473a11..6497eea 100644 --- a/lib/activate/activate.h +++ b/lib/activate/activate.h @@ -44,6 +44,15 @@ struct lv_activate_opts { /* target attribute flags */ #define MIRROR_LOG_CLUSTERED 0x00000001U +/* thin target attribute flags */ +enum { + /* bitfields - new features from 1.1 version */ + THIN_FEATURE_DISCARD = (1 << 0), + THIN_FEATURE_EXTERNAL_ORIGIN = (1 << 1), + THIN_FEATURE_HELD_ROOT = (1 << 2), + THIN_FEATURE_BLOCK_SIZE = (1 << 3), +}; + void set_activation(int activation); int activation(void); diff --git a/lib/thin/thin.c b/lib/thin/thin.c index 47fb0ec..974293c 100644 --- a/lib/thin/thin.c +++ b/lib/thin/thin.c @@ -487,16 +487,51 @@ static int _thin_target_percent(void **target_state __attribute__((unused)), static int _thin_target_present(struct cmd_context *cmd, const struct lv_segment *seg, - unsigned *attributes __attribute__((unused))) + unsigned *attributes) { static int _checked = 0; static int _present = 0; + static int _attrs = 0; + uint32_t maj, min, patchlevel; if (!_checked) { _present = target_present(cmd, THIN_MODULE, 1); + + if (!target_version(THIN_MODULE, &maj, &min, &patchlevel)) { + log_error("Cannot read " THIN_MODULE " target version."); + return 0; + } + log_debug("Target " THIN_MODULE " has version %d:%d:%d.", + maj, min, patchlevel); + + /* For testing allow to override via shell variable */ + if (getenv("LVM_THIN_VERSION_MIN")) + min = atoi(getenv("LVM_THIN_VERSION_MIN")); + + if (maj >=1 && min >= 1) + _attrs |= THIN_FEATURE_DISCARD; + else + log_verbose("Target " THIN_MODULE + " without discard support."); + + if (maj >=1 && min >= 1) + _attrs |= THIN_FEATURE_EXTERNAL_ORIGIN; + else + log_verbose("Target " THIN_MODULE + " without external origin support."); +#if 0 + if (maj >=1 && min >= 1) + _attrs |= THIN_FEATURE_BLOCK_SIZE; + else + log_verbose("Target " THIN_MODULE + " without non power of 2 block size."); +#endif _checked = 1; } + if (attributes) + *attributes = _attrs; + return _present; } #endif

1 0

master - libdm: support reserve and release metadata snap msg
by Zdenek Kabelac 18 Jul '12

18 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=c4db22bd4f3d4a73… Commit: c4db22bd4f3d4a7328b2e03c27a5c1edb167d47f Parent: dcd4afc7163fa08b8bd43aeb4cabe3d8a792e20b Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Wed Jul 4 11:28:53 2012 +0200 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Jul 18 14:34:19 2012 +0200 libdm: support reserve and release metadata snap msg Add support for new message types for thinp target 1.1 --- WHATS_NEW_DM | 1 + libdm/libdevmapper.h | 2 ++ libdm/libdm-deptree.c | 6 ++++++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index e11ebcb..416beca 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.76 - =============================== + Add support for thin pool message release/reserve_metadata_snap. Add support for thin pool discard and external origin. Add configure --enable-udev-rule-exec-detection to detect exec path in rules. Use sbindir in udev rules by default and remove executable path detection. diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 6eeaf87..549a635 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -650,6 +650,8 @@ typedef enum { DM_THIN_MESSAGE_CREATE_THIN, /* device_id */ DM_THIN_MESSAGE_DELETE, /* device_id */ DM_THIN_MESSAGE_SET_TRANSACTION_ID, /* current_id, new_id */ + DM_THIN_MESSAGE_RESERVE_METADATA_SNAP, /* 1.1 */ + DM_THIN_MESSAGE_RELEASE_METADATA_SNAP, /* 1.1 */ } dm_thin_message_t; int dm_tree_node_add_thin_pool_message(struct dm_tree_node *node, diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index a43b6a2..acd82ca 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1411,6 +1411,12 @@ static int _thin_pool_node_message(struct dm_tree_node *dnode, struct thin_messa m->u.m_set_transaction_id.current_id, m->u.m_set_transaction_id.new_id); break; + case DM_THIN_MESSAGE_RESERVE_METADATA_SNAP: /* 1.1 */ + r = dm_snprintf(buf, sizeof(buf), "reserve_metadata_snap"); + break; + case DM_THIN_MESSAGE_RELEASE_METADATA_SNAP: /* 1.1 */ + r = dm_snprintf(buf, sizeof(buf), "release_metadata_snap"); + break; default: r = -1; }

1 0

master - libdm: add support for external origin and discard
by Zdenek Kabelac 18 Jul '12

18 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=dcd4afc7163fa08b… Commit: dcd4afc7163fa08b8bd43aeb4cabe3d8a792e20b Parent: 00d9bf8107b47e51fc966dd5bd78789190c6e846 Author: Zdenek Kabelac <zkabelac(a)redhat.com> AuthorDate: Sat Feb 4 13:49:40 2012 +0100 Committer: Zdenek Kabelac <zkabelac(a)redhat.com> CommitterDate: Wed Jul 18 14:33:37 2012 +0200 libdm: add support for external origin and discard --- WHATS_NEW_DM | 1 + libdm/libdevmapper.h | 14 +++++ libdm/libdm-deptree.c | 140 +++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 134 insertions(+), 21 deletions(-) diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index 711104b..e11ebcb 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,5 +1,6 @@ Version 1.02.76 - =============================== + Add support for thin pool discard and external origin. Add configure --enable-udev-rule-exec-detection to detect exec path in rules. Use sbindir in udev rules by default and remove executable path detection. Remove hard-coded paths for dmeventd fifos and use default-dm-run-dir. diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index a8bf885..6eeaf87 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -657,6 +657,17 @@ int dm_tree_node_add_thin_pool_message(struct dm_tree_node *node, uint64_t id1, uint64_t id2); /* + * Set thin pool discard features + * ignore - Disable discard support + * no_passdown - Don't pass discard down to underlaying data device, + * just remove the mapping + * Feature is available for 1.1 + */ +int dm_tree_node_set_thin_pool_discard(struct dm_tree_node *node, + unsigned ignore, + unsigned no_passdown); + +/* * FIXME: Defines bellow are based on kernel's dm-thin.c defines * MAX_DEV_ID ((1 << 24) - 1) */ @@ -666,6 +677,9 @@ int dm_tree_node_add_thin_target(struct dm_tree_node *node, const char *pool_uuid, uint32_t device_id); +int dm_tree_node_set_thin_external_origin(struct dm_tree_node *node, + const char *external_uuid); + void dm_tree_node_set_udev_flags(struct dm_tree_node *node, uint16_t udev_flags); void dm_tree_node_set_presuspend_node(struct dm_tree_node *node, diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index 91bafe5..a43b6a2 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -186,11 +186,14 @@ struct load_segment { struct dm_tree_node *metadata; /* Thin_pool */ struct dm_tree_node *pool; /* Thin_pool, Thin */ + struct dm_tree_node *external; /* Thin */ struct dm_list thin_messages; /* Thin_pool */ uint64_t transaction_id; /* Thin_pool */ uint64_t low_water_mark; /* Thin_pool */ uint32_t data_block_size; /* Thin_pool */ unsigned skip_block_zeroing; /* Thin_pool */ + unsigned ignore_discard; /* Thin_pool 1.1 */ + unsigned no_discard_passdown; /* Thin_pool 1.1 */ uint32_t device_id; /* Thin */ }; @@ -2145,6 +2148,57 @@ static int _raid_emit_segment_line(struct dm_task *dmt, uint32_t major, return 1; } +static int _thin_pool_emit_segment_line(struct dm_task *dmt, + struct load_segment *seg, + char *params, size_t paramsize) +{ + int pos = 0; + char pool[DM_FORMAT_DEV_BUFSIZE], metadata[DM_FORMAT_DEV_BUFSIZE]; + int features = (seg->skip_block_zeroing ? 1 : 0) + + (seg->ignore_discard ? 1 : 0) + + (seg->no_discard_passdown ? 1 : 0); + + if (!_build_dev_string(metadata, sizeof(metadata), seg->metadata)) + return_0; + + if (!_build_dev_string(pool, sizeof(pool), seg->pool)) + return_0; + + EMIT_PARAMS(pos, "%s %s %d %" PRIu64 " %d%s%s%s", metadata, pool, + seg->data_block_size, seg->low_water_mark, features, + seg->skip_block_zeroing ? " skip_block_zeroing" : "", + seg->ignore_discard ? " ignore_discard" : "", + seg->no_discard_passdown ? " no_discard_passdown" : "" + ); + + return 1; +} + +static int _thin_emit_segment_line(struct dm_task *dmt, + struct load_segment *seg, + char *params, size_t paramsize) +{ + int pos = 0; + char pool[DM_FORMAT_DEV_BUFSIZE]; + char external[DM_FORMAT_DEV_BUFSIZE + 1]; + + if (!_build_dev_string(pool, sizeof(pool), seg->pool)) + return_0; + + if (!seg->external) + *external = 0; + else { + *external = ' '; + if (!_build_dev_string(external + 1, sizeof(external) - 1, + seg->external)) + return_0; + } + + EMIT_PARAMS(pos, "%s %d%s", pool, seg->device_id, external); + + return 1; +} + static int _emit_segment_line(struct dm_task *dmt, uint32_t major, uint32_t minor, struct load_segment *seg, uint64_t *seg_start, char *params, @@ -2154,7 +2208,6 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major, int r; int target_type_is_raid = 0; char originbuf[DM_FORMAT_DEV_BUFSIZE], cowbuf[DM_FORMAT_DEV_BUFSIZE]; - char pool[DM_FORMAT_DEV_BUFSIZE], metadata[DM_FORMAT_DEV_BUFSIZE]; switch(seg->type) { case SEG_ERROR: @@ -2223,18 +2276,12 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major, break; case SEG_THIN_POOL: - if (!_build_dev_string(metadata, sizeof(metadata), seg->metadata)) - return_0; - if (!_build_dev_string(pool, sizeof(pool), seg->pool)) + if (!_thin_pool_emit_segment_line(dmt, seg, params, paramsize)) return_0; - EMIT_PARAMS(pos, "%s %s %d %" PRIu64 " %s", metadata, pool, - seg->data_block_size, seg->low_water_mark, - seg->skip_block_zeroing ? "1 skip_block_zeroing" : "0"); break; case SEG_THIN: - if (!_build_dev_string(pool, sizeof(pool), seg->pool)) + if (!_thin_emit_segment_line(dmt, seg, params, paramsize)) return_0; - EMIT_PARAMS(pos, "%s %d", pool, seg->device_id); break; } @@ -2956,6 +3003,28 @@ int dm_tree_node_add_replicator_dev_target(struct dm_tree_node *node, return 1; } +static struct load_segment *_get_single_load_segment(struct dm_tree_node *node, + unsigned type) +{ + struct load_segment *seg; + + if (node->props.segment_count != 1) { + log_error("Node %s must have only one segment.", + dm_segtypes[type].target); + return NULL; + } + + seg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); + if (seg->type != type) { + log_error("Node %s has segment type %s.", + dm_segtypes[type].target, + dm_segtypes[seg->type].target); + return NULL; + } + + return seg; +} + static int _thin_validate_device_id(uint32_t device_id) { if (device_id > DM_THIN_MAX_DEVICE_ID) { @@ -3043,20 +3112,11 @@ int dm_tree_node_add_thin_pool_message(struct dm_tree_node *node, dm_thin_message_t type, uint64_t id1, uint64_t id2) { - struct load_segment *seg; struct thin_message *tm; + struct load_segment *seg; - if (node->props.segment_count != 1) { - log_error("Thin pool node must have only one segment."); - return 0; - } - - seg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment); - if (seg->type != SEG_THIN_POOL) { - log_error("Thin pool node has segment type %s.", - dm_segtypes[seg->type].target); - return 0; - } + if (!(seg = _get_single_load_segment(node, SEG_THIN_POOL))) + return_0; if (!(tm = dm_pool_zalloc(node->dtree->mem, sizeof (*tm)))) { log_error("Failed to allocate thin message."); @@ -3111,6 +3171,21 @@ int dm_tree_node_add_thin_pool_message(struct dm_tree_node *node, return 1; } +int dm_tree_node_set_thin_pool_discard(struct dm_tree_node *node, + unsigned ignore, + unsigned no_passdown) +{ + struct load_segment *seg; + + if (!(seg = _get_single_load_segment(node, SEG_THIN_POOL))) + return_0; + + seg->ignore_discard = ignore; + seg->no_discard_passdown = no_passdown; + + return 1; +} + int dm_tree_node_add_thin_target(struct dm_tree_node *node, uint64_t size, const char *pool_uuid, @@ -3139,6 +3214,29 @@ int dm_tree_node_add_thin_target(struct dm_tree_node *node, return 1; } +int dm_tree_node_set_thin_external_origin(struct dm_tree_node *node, + const char *external_uuid) +{ + struct dm_tree_node *external; + struct load_segment *seg; + + if (!(seg = _get_single_load_segment(node, SEG_THIN))) + return_0; + + if (!(external = dm_tree_find_node_by_uuid(node->dtree, + external_uuid))) { + log_error("Missing thin external origin uuid %s.", + external_uuid); + return 0; + } + + if (!_link_tree_nodes(node, external)) + return_0; + + seg->external = external; + + return 1; +} int dm_get_status_thin_pool(struct dm_pool *mem, const char *params, struct dm_status_thin_pool **status)

1 0

master - TEST (lvresize-raid): Don't run test when RAID module doesn't exist
by Jonathan Brassow 17 Jul '12

17 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=00d9bf8107b47e51… Commit: 00d9bf8107b47e51fc966dd5bd78789190c6e846 Parent: 3f5cdf20cd65173cc36f765ebe68134299c9cbc8 Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Tue Jul 17 10:50:21 2012 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Tue Jul 17 10:50:21 2012 -0500 TEST (lvresize-raid): Don't run test when RAID module doesn't exist Check for RAID module and skip test if not there. --- test/shell/lvresize-raid.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/test/shell/lvresize-raid.sh b/test/shell/lvresize-raid.sh index c6c5dd1..ea5cc80 100644 --- a/test/shell/lvresize-raid.sh +++ b/test/shell/lvresize-raid.sh @@ -11,6 +11,8 @@ . lib/test +aux target_at_least dm-raid 1 1 0 || skip + aux prepare_vg 5 80 # Extend a 2-way RAID1

1 0

master - configure: default tmpfile dir in PREFIX/lib/tmpfiles.d
by Peter Rajnoha 16 Jul '12

16 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=3f5cdf20cd65173c… Commit: 3f5cdf20cd65173cc36f765ebe68134299c9cbc8 Parent: 35ebc5d343e2e01b719ce15c801d522a36e54ac4 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Jul 16 11:13:32 2012 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Jul 16 11:17:02 2012 +0200 configure: default tmpfile dir in PREFIX/lib/tmpfiles.d SYSCONFDIR (the /etc) contains overrides to system-wide settings. System-wide settings are in PREFIX/lib/tmpfiles.d by default --- configure | 4 ++-- configure.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index e54efd3..ca71fdb 100755 --- a/configure +++ b/configure @@ -1613,7 +1613,7 @@ Optional Packages: systemd service files in DIR --with-tmpfilesdir=DIR install configuration files for management of volatile files and directories in DIR - [[SYSCONFDIR/tmpfiles.d]] + [[PREFIX/lib/tmpfiles.d]] --with-dmeventd-pidfile=PATH dmeventd pidfile [[PID_DIR/dmeventd.pid]] --with-dmeventd-path=PATH @@ -9925,7 +9925,7 @@ fi if test "${with_tmpfilesdir+set}" = set; then : withval=$with_tmpfilesdir; tmpfilesdir=$withval else - tmpfilesdir='${sysconfdir}/tmpfiles.d' + tmpfilesdir='${prefix}/lib/tmpfiles.d' fi ################################################################################ diff --git a/configure.in b/configure.in index 6c27324..8bf0c4e 100644 --- a/configure.in +++ b/configure.in @@ -1280,8 +1280,8 @@ fi ################################################################################ AC_ARG_WITH(tmpfilesdir, AC_HELP_STRING([--with-tmpfilesdir=DIR], - [install configuration files for management of volatile files and directories in DIR [[SYSCONFDIR/tmpfiles.d]]]), - tmpfilesdir=$withval, tmpfilesdir='${sysconfdir}/tmpfiles.d') + [install configuration files for management of volatile files and directories in DIR [[PREFIX/lib/tmpfiles.d]]]), + tmpfilesdir=$withval, tmpfilesdir='${prefix}/lib/tmpfiles.d') ################################################################################ dnl -- Ensure additional headers required if test x$READLINE = xyes; then

1 0

master - conf: add a comment about obsolete .cache file
by Peter Rajnoha 16 Jul '12

16 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=35ebc5d343e2e01b… Commit: 35ebc5d343e2e01b719ce15c801d522a36e54ac4 Parent: 07e4ac7b00f680ad88aa0ff4c835ea2b27eab44b Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Jul 16 10:43:04 2012 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Jul 16 10:43:04 2012 +0200 conf: add a comment about obsolete .cache file --- doc/example.conf.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/doc/example.conf.in b/doc/example.conf.in index fbb9271..a085014 100644 --- a/doc/example.conf.in +++ b/doc/example.conf.in @@ -86,6 +86,9 @@ devices { # It is safe to delete the contents: the tools regenerate it. # (The old setting 'cache' is still respected if neither of # these new ones is present.) + # N.B. This type of caching is obsolete and existing .cache + # file is removed if the list of devices is obtained from + # udev by setting the obtain_device_list_from_udev to 1. cache_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_CACHE_SUBDIR@" cache_file_prefix = ""

1 0

master - lvconvert: count % upwards when merging a snapshot
by Peter Rajnoha 10 Jul '12

10 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=07e4ac7b00f680ad… Commit: 07e4ac7b00f680ad88aa0ff4c835ea2b27eab44b Parent: cd8ea8b437de53f0019bd69d542a7d01f3d5b7d3 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Jul 10 15:30:18 2012 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue Jul 10 15:30:18 2012 +0200 lvconvert: count % upwards when merging a snapshot Before: # lvconvert --merge -i 1 vg/lvol1 Merging of volume lvol1 started. lvol0: Merged: 36.7% lvol0: Merged: 21.3% lvol0: Merged: 5.8% lvol0: Merged: 0.0% Merge of snapshot into logical volume lvol0 has finished. Logical volume "lvol1" successfully removed After: # lvconvert --merge -i 1 vg/lvol1 Merging of volume lvol1 started. lvol0: Merged: 61.4% lvol0: Merged: 73.0% lvol0: Merged: 88.4% lvol0: Merged: 100.0% Merge of snapshot into logical volume lvol0 has finished. Logical volume "lvol1" successfully removed --- WHATS_NEW | 1 + tools/lvconvert.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 9d6f091..f20f4fb 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Count percentage of completeness upwards when merging a snapshot volume. Skip activation when using vg/lvchange --sysinit -a ay and lvmetad is active. Fix extending RAID 4/5/6 logical volumes Fix test for PV with unknown VG in process_each_pv to ignore ignored mdas. diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 074821d..76cc9b3 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -580,10 +580,10 @@ static progress_t _poll_merge_progress(struct cmd_context *cmd, if (parms->progress_display) log_print("%s: %s: %.1f%%", lv->name, parms->progress_title, - percent_to_float(percent)); + 100.0 - percent_to_float(percent)); else log_verbose("%s: %s: %.1f%%", lv->name, parms->progress_title, - percent_to_float(percent)); + 100.0 - percent_to_float(percent)); if (percent == PERCENT_0) return PROGRESS_FINISHED_ALL;

1 0

master - activate: skip manual activation for --sysinit -aay
by Peter Rajnoha 10 Jul '12

10 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cd8ea8b437de53f0… Commit: cd8ea8b437de53f0019bd69d542a7d01f3d5b7d3 Parent: 8767435ef847831455fadc1f7e8f4d2d94aef0d5 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Jul 10 13:49:46 2012 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue Jul 10 14:01:33 2012 +0200 activate: skip manual activation for --sysinit -aay When --sysinit -a ay is used with vg/lvchange and lvmetad is up and running, we should skip manual activation as that would be a useless step - all volumes are autoactivated once all the PVs for a VG are present. If lvmetad is not active at the time of the vgchange --sysinit -a ay call, the activation proceeds in standard 'manual' way. This way, we can still have vg/lvchange --sysinit -a ay called unconditionally in system initialization scripts no matter if lvmetad is used or not. --- WHATS_NEW | 1 + man/lvchange.8.in | 5 +++++ man/vgchange.8.in | 5 +++++ tools/lvchange.c | 7 +++++++ tools/vgchange.c | 7 +++++++ 5 files changed, 25 insertions(+), 0 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 02ac14a..9d6f091 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Skip activation when using vg/lvchange --sysinit -a ay and lvmetad is active. Fix extending RAID 4/5/6 logical volumes Fix test for PV with unknown VG in process_each_pv to ignore ignored mdas. Update man pages with --activate ay option and auto_activation_volume_list. diff --git a/man/lvchange.8.in b/man/lvchange.8.in index c7507d4..bf9ef48 100644 --- a/man/lvchange.8.in +++ b/man/lvchange.8.in @@ -105,6 +105,11 @@ this is equivalent to using \fB\-\-ignorelockingfailure\fP, \fB\-\-ignoremonitoring\fP, \fB\-\-poll n\fP and setting \fBLVM_SUPPRESS_LOCKING_FAILURE_MESSAGES\fP environment variable. + +If \fB\-\-sysinit\fP is used in conjunction with lvmetad(8) enabled and running, +autoactivation is preferred over manual activation via direct lvchange call. +Logical volumes are autoactivated according to auto_activation_volume_list +set in lvm.conf(5). .TP .B \-\-noudevsync Disable udev synchronisation. The diff --git a/man/vgchange.8.in b/man/vgchange.8.in index 28e2623..0f5fc58 100644 --- a/man/vgchange.8.in +++ b/man/vgchange.8.in @@ -121,6 +121,11 @@ this is equivalent to using .B \-\-poll n and setting \fBLVM_SUPPRESS_LOCKING_FAILURE_MESSAGES\fP environment variable. + +If \fB\-\-sysinit\fP is used in conjunction with lvmetad(8) enabled and running, +autoactivation is preferred over manual activation via direct vgchange call. +Logical volumes are autoactivated according to auto_activation_volume_list +set in lvm.conf(5). .TP .BR \-\-noudevsync Disable udev synchronisation. The diff --git a/tools/lvchange.c b/tools/lvchange.c index 9876847..9054ac7 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -798,6 +798,13 @@ int lvchange(struct cmd_context *cmd, int argc, char **argv) return EINVALID_CMD_LINE; } + if (arg_count(cmd, sysinit_ARG) && lvmetad_active() && + arg_uint_value(cmd, activate_ARG, 0) == CHANGE_AAY) { + log_warn("lvmetad is active while using --sysinit -a ay, " + "skipping manual activation"); + return ECMD_PROCESSED; + } + return process_each_lv(cmd, argc, argv, update ? READ_FOR_UPDATE : 0, NULL, &lvchange_single); diff --git a/tools/vgchange.c b/tools/vgchange.c index ebabb08..2013447 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -608,6 +608,13 @@ int vgchange(struct cmd_context *cmd, int argc, char **argv) return EINVALID_CMD_LINE; } + if (arg_count(cmd, sysinit_ARG) && lvmetad_active() && + arg_uint_value(cmd, activate_ARG, 0) == CHANGE_AAY) { + log_warn("lvmetad is active while using --sysinit -a ay, " + "skipping manual activation"); + return ECMD_PROCESSED; + } + return process_each_vg(cmd, argc, argv, update ? READ_FOR_UPDATE : 0, NULL, &vgchange_single); }

1 0

master - RAID: Fix extending size of RAID 4/5/6 logical volumes.
by Jonathan Brassow 03 Jul '12

03 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=8767435ef8478314… Commit: 8767435ef847831455fadc1f7e8f4d2d94aef0d5 Parent: bf81d5607a47eb0bf3963be54f4b765b2d24b895 Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Tue Jun 26 09:44:54 2012 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Tue Jun 26 09:44:54 2012 -0500 RAID: Fix extending size of RAID 4/5/6 logical volumes. Reducing a RAID 4/5/6 LV or extending it with a different number of stripes is still not implemented. This patch covers the "simple" case where the LV is extended with the same number of stripes as the orginal. --- WHATS_NEW | 1 + lib/metadata/lv_manip.c | 14 +++++++- test/shell/lvresize-raid.sh | 78 +++++++++++++++++++++++++++++++++++++++++++ tools/lvresize.c | 10 ++++- 4 files changed, 100 insertions(+), 3 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 2e649b1..02ac14a 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.97 - =============================== + Fix extending RAID 4/5/6 logical volumes Fix test for PV with unknown VG in process_each_pv to ignore ignored mdas. Update man pages with --activate ay option and auto_activation_volume_list. Fix _alloc_parallel_area to avoid picking already-full areas for raid devices. diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 21508fd..0d89b4a 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -697,6 +697,10 @@ static uint32_t _calc_area_multiple(const struct segment_type *segtype, if (segtype_is_striped(segtype)) return area_count; + /* Parity RAID (e.g. RAID 4/5/6) */ + if (segtype_is_raid(segtype) && segtype->parity_devs) + return area_count - segtype->parity_devs; + /* Mirrored stripes */ if (stripes) return stripes; @@ -829,7 +833,15 @@ static struct alloc_handle *_alloc_init(struct cmd_context *cmd, ah->parity_count = parity_count; ah->region_size = region_size; ah->alloc = alloc; - ah->area_multiple = _calc_area_multiple(segtype, area_count, stripes); + + /* + * For the purposes of allocation, area_count and parity_count are + * kept separately. However, the 'area_count' field in an + * lv_segment includes both; and this is what '_calc_area_multiple' + * is calculated from. So, we must pass in the total count to get + * a correct area_multiple. + */ + ah->area_multiple = _calc_area_multiple(segtype, area_count + parity_count, stripes); ah->mirror_logs_separate = find_config_tree_bool(cmd, "allocation/mirror_logs_require_separate_pvs", DEFAULT_MIRROR_LOGS_REQUIRE_SEPARATE_PVS); diff --git a/test/shell/lvresize-raid.sh b/test/shell/lvresize-raid.sh new file mode 100644 index 0000000..c6c5dd1 --- /dev/null +++ b/test/shell/lvresize-raid.sh @@ -0,0 +1,78 @@ +#!/bin/sh +# 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 + +. lib/test + +aux prepare_vg 5 80 + +# Extend a 2-way RAID1 +for deactivate in true false; do + lvcreate --type raid1 -m 1 -l 2 -n $lv1 $vg + + if $deactivate; then + lvchange -an $vg/$lv1 + fi + + lvresize -l +2 $vg/$lv1 + + #check raid_images_contiguous $vg $lv1 + + lvremove -ff $vg +done + +# Reduce 2-way RAID1 +for deactivate in true false; do + lvcreate --type raid1 -m 1 -l 4 -n $lv1 $vg + + if $deactivate; then + lvchange -an $vg/$lv1 + fi + + should lvresize -l -2 $vg/$lv1 + + #check raid_images_contiguous $vg $lv1 + + lvremove -ff $vg +done + +# Extend 3-striped RAID 4/5/6 +for i in 4 5 6 ; do + for deactivate in true false; do + lvcreate --type raid$i -i 3 -l 3 -n $lv1 $vg + + if $deactivate; then + lvchange -an $vg/$lv1 + fi + + lvresize -l +3 $vg/$lv1 + + #check raid_images_contiguous $vg $lv1 + + lvremove -ff $vg + done +done + +# Reduce 3-striped RAID 4/5/6 +for i in 4 5 6 ; do + for deactivate in true false; do + lvcreate --type raid$i -i 3 -l 6 -n $lv1 $vg + + if $deactivate; then + lvchange -an $vg/$lv1 + fi + + should lvresize -l -3 $vg/$lv1 + + #check raid_images_contiguous $vg $lv1 + + lvremove -ff $vg + done +done diff --git a/tools/lvresize.c b/tools/lvresize.c index 55d1334..64474e0 100644 --- a/tools/lvresize.c +++ b/tools/lvresize.c @@ -598,11 +598,12 @@ static int _lvresize(struct cmd_context *cmd, struct volume_group *vg, * and data LV could be any type (i.e. mirror)) */ dm_list_iterate_items(seg, seg_mirrors ? &seg_lv(mirr_seg, 0)->segments : lv_is_thin_pool(lv) ? &seg_lv(first_seg(lv), 0)->segments : &lv->segments) { - if (!seg_is_striped(seg)) + if (!seg_is_striped(seg) && + (!seg_is_raid(seg) || seg_is_mirrored(seg))) continue; sz = seg->stripe_size; - str = seg->area_count; + str = seg->area_count - lp->segtype->parity_devs; if ((seg_stripesize && seg_stripesize != sz && sz && !lp->stripe_size) || @@ -618,6 +619,11 @@ static int _lvresize(struct cmd_context *cmd, struct volume_group *vg, if (!lp->stripes) lp->stripes = seg_stripes; + else if (seg_is_raid(first_seg(lv)) && + (lp->stripes != seg_stripes)) { + log_error("Unable to extend \"%s\" segment type with different number of stripes.", first_seg(lv)->segtype->name); + return ECMD_FAILED; + } if (!lp->stripe_size && lp->stripes > 1) { if (seg_stripesize) {

1 0

master - TEST (lvconvert-raid): Turn on RAID conversion testing under snapshots
by Jonathan Brassow 03 Jul '12

03 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=bf81d5607a47eb0b… Commit: bf81d5607a47eb0bf3963be54f4b765b2d24b895 Parent: 7168880caa5f09da254e930313c2d59547643bb2 Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Tue Jun 26 06:45:45 2012 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Tue Jun 26 06:45:45 2012 -0500 TEST (lvconvert-raid): Turn on RAID conversion testing under snapshots --- test/shell/lvconvert-raid.sh | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/test/shell/lvconvert-raid.sh b/test/shell/lvconvert-raid.sh index 6c289a8..a4ebac9 100644 --- a/test/shell/lvconvert-raid.sh +++ b/test/shell/lvconvert-raid.sh @@ -81,11 +81,7 @@ vgcreate -c n -s 256k $vg $(cat DEVICES) ########################################### # RAID1 convert tests ########################################### -# -# FIXME: Snapshots of RAID is available, but there are kernel bugs that -# still prevent its use. -#for under_snap in false true; do -for under_snap in false; do +for under_snap in false true; do for i in 1 2 3 4; do for j in 1 2 3 4; do if [ $i -eq 1 ]; then

1 0

master - TEST (lvconvert-raid): localize a function variable
by Jonathan Brassow 03 Jul '12

03 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=7168880caa5f09da… Commit: 7168880caa5f09da254e930313c2d59547643bb2 Parent: 149ab6921e9029e12899c280f290656b1b60742f Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Mon Jun 25 22:25:46 2012 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Mon Jun 25 22:25:46 2012 -0500 TEST (lvconvert-raid): localize a function variable Function was overwriting a global variable because it used a variable of the same name without first declaring it with 'local'. --- test/shell/lvconvert-raid.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/test/shell/lvconvert-raid.sh b/test/shell/lvconvert-raid.sh index e7df164..6c289a8 100644 --- a/test/shell/lvconvert-raid.sh +++ b/test/shell/lvconvert-raid.sh @@ -60,6 +60,7 @@ is_in_sync_() { # wait_for_sync <VG/LV> wait_for_sync_() { + local i for i in {1..100} ; do is_in_sync_ $1 && return sleep 1

1 0

master - TEST (lvcreate-raid): Allow more time for RAID arrays to sync
by Jonathan Brassow 03 Jul '12

03 Jul '12

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=149ab6921e9029e1… Commit: 149ab6921e9029e12899c280f290656b1b60742f Parent: 1d0a2b919fe173e3a25e5f19d535588bb5b214e2 Author: Jonathan Brassow <jbrassow(a)redhat.com> AuthorDate: Mon Jun 25 22:20:24 2012 -0500 Committer: Jonathan Brassow <jbrassow(a)redhat.com> CommitterDate: Mon Jun 25 22:20:24 2012 -0500 TEST (lvcreate-raid): Allow more time for RAID arrays to sync My machines can run very slow sometimes causing this test to fail when it would otherwise have succeeded given more time. --- test/shell/lvcreate-raid.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/shell/lvcreate-raid.sh b/test/shell/lvcreate-raid.sh index 21ab9a1..b6792c5 100644 --- a/test/shell/lvcreate-raid.sh +++ b/test/shell/lvcreate-raid.sh @@ -41,7 +41,7 @@ function wait_for_raid_sync() local i=0 while ! is_raid_in_sync $1; do - sleep .2 + sleep 1 i=$(($i + 1)) if [ $i -gt 500 ]; then echo "Sync is taking too long - assume stuck"

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits July 2012