mirror of
git://sourceware.org/git/lvm2.git
synced 2025-03-25 18:50:51 +03:00
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.
This commit is contained in:
parent
c7b9f0ab42
commit
54685c20fc
@ -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.
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user