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.

diff --git a/WHATS_NEW b/WHATS_NEW
index a1099fe22bf752da61789a6a99acffd38daf82a7..ff300399a020adfa85585028b0c16b4a51ed27a7 100644 (file)
--- 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 39fa45fff85f38b4c10ce86fa218749c997a60a9..6f88fd846409deab51d6261762700878affa20df 100644 (file)
--- 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 958e353b5a6deb0a1e8247eea6a6092702888635..67ecd41c99aae0014bb3871f27c6eb2ffb445ab6 100644 (file)
--- 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;