lvm2-commits August 2014

lvm2-commits@lists.fedorahosted.org

6 participants
92 discussions

master - test: Add a test for lvscan --cache.
by Petr Rockai 04 Aug '14

04 Aug '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=03a88da86895f470… Commit: 03a88da86895f4700edf77af4efde62a30e67bff Parent: 54685c20fc9dfb155a2e5bc9d8cf5f0aad944305 Author: Petr Rockai <prockai(a)redhat.com> AuthorDate: Mon Aug 4 17:00:34 2014 +0200 Committer: Petr Rockai <prockai(a)redhat.com> CommitterDate: Mon Aug 4 17:03:17 2014 +0200 test: Add a test for lvscan --cache. --- test/shell/lvmetad-lvscan-cache.sh | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/test/shell/lvmetad-lvscan-cache.sh b/test/shell/lvmetad-lvscan-cache.sh new file mode 100644 index 0000000..529753c --- /dev/null +++ b/test/shell/lvmetad-lvscan-cache.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# Copyright (C) 2014 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/inittest + +test -e LOCAL_LVMETAD || skip + +aux prepare_pvs 2 + +vgcreate $vg1 $dev1 $dev2 +lvcreate -n testlv -m 1 -l 1 $vg1 +vgs | grep $vg1 + +lvscan --cache $vg1/testlv + +vgs | grep $vg1 + +aux disable_dev $dev2 + +# pvscan --cache already ran for the disabled device above, this should be a +# no-op (but should not segfault!) +lvscan --cache $vg1/testlv + +vgremove -ff $vg1

1 0

master - filters: fix regression caused by commit e80884cd080cad7e10be4588e3493b9000649426
by Peter Rajnoha 01 Aug '14

01 Aug '14

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=54685c20fc9dfb15… Commit: 54685c20fc9dfb155a2e5bc9d8cf5f0aad944305 Parent: c7b9f0ab424136b686cd08ff7416078e7c3728c3 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Fri Aug 1 11:28:18 2014 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Fri Aug 1 11:39:53 2014 +0200 filters: fix regression caused by commit e80884cd080cad7e10be4588e3493b9000649426 Commit e80884cd080cad7e10be4588e3493b9000649426 tried to dump filters for them to be reevaluated when creating a PV to avoid overwriting any existing signature that may have been created after last scan/filtering. However, we need to call refresh_filters instead of persistent_filter->dump since dump requires proper rescannig to fill up the persistent filter again. However, this is true only for pvcreate but not for vgcreate with PV creation where the scanning happens before this PV creation and hence the next rescan (if not full scan), does not fill the persistent filter. Also, move refresh_filters so that it's called sooner and only for pvcreate, vgcreate already calls lvmcache_label_scan(cmd, 2) which then calls refresh_filters itself, so no need to reevaluate this again. This caused the persistent filter (/etc/lvm/cache/.cache file) to be wrong and contain only the PV just being processed with vgcreate <vg_name> <pv_name_to_create>. This regression caused other block devices to be filtered out in case the vgcreate with PV creation was used and then the persistent filter is used by any other LVM command afterwards. --- WHATS_NEW | 1 + lib/metadata/metadata.c | 7 ------- tools/pvcreate.c | 9 +++++++++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a1099fe..ff30039 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.109 - ================================= + Fix incorrect persistent .cache after vgcreate with PV creation. (2.02.108) Display actual size changed when resizing LV. Allow approximate allocation with +%FREE in lvextend. Remove possible spurious "not found" message on PV create before wiping. diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 39fa45f..6f88fd8 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -1337,13 +1337,6 @@ static int pvcreate_check(struct cmd_context *cmd, const char *name, /* FIXME Check partition type is LVM unless --force is given */ - /* - * Make sure we don't overwrite any existing signature - * that may have been created after last time we did filtering. - */ - if (cmd->filter->wipe) - cmd->filter->wipe(cmd->filter); - /* Is there a pv here already? */ pv = find_pv_by_name(cmd, name, 1, 1); diff --git a/tools/pvcreate.c b/tools/pvcreate.c index 958e353..67ecd41 100644 --- a/tools/pvcreate.c +++ b/tools/pvcreate.c @@ -105,6 +105,15 @@ int pvcreate(struct cmd_context *cmd, int argc, char **argv) return EINVALID_CMD_LINE; } + /* + * Make sure we don't overwrite any existing signature + * that may have been created after last time we did filtering. + */ + if (!(refresh_filters(cmd))) { + log_error("Failed to refresh filters before pvcreate."); + return ECMD_FAILED; + } + for (i = 0; i < argc; i++) { if (sigint_caught()) return_ECMD_FAILED;

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits August 2014