shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

pvs: don't treat duplicate PVs as missed

Browse Source 
The recent addition to check for PVs that were
missed during the first iteration of processing
was unintentionally catching duplicate PVs because
duplicates were not removed from the all_devices
list when the primary dev was processed.

Also change a message from warn back to verbose.
This commit is contained in:
David Teigland 2015-10-27 12:03:57 -05:00
parent a4418b34c1
commit 5886ff64eb
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/toollib.c
View File

@ -2884,13 +2884,18 @@ static int _process_pvs_in_vg(struct cmd_context *cmd,
ret_max = ret;
}
/*
* We have processed the PV on device pv->dev. Now
* deal with any duplicates of this PV on other
* devices.
*/
/*
* This is a very rare and obscure case where multiple
* duplicate devices are specified on the command line
* referring to this PV. In this case we want to
* process this PV once for each specified device.
*/
if (!skip && !dm_list_empty(arg_devices)) {
while ((dil = _device_list_find_pvid(arg_devices, pv))) {
_device_list_remove(arg_devices, dil->dev);
@ -2925,7 +2930,6 @@ static int _process_pvs_in_vg(struct cmd_context *cmd,
* we want each of them to be displayed in the context
* of this VG, so that this VG name appears next to it.
*/
if (process_all_devices && lvmcache_found_duplicate_pvs()) {
while ((dil = _device_list_find_pvid(all_devices, pv))) {
_device_list_remove(all_devices, dil->dev);
@ -2942,6 +2946,20 @@ static int _process_pvs_in_vg(struct cmd_context *cmd,
lvmcache_replace_dev(cmd, pv, dev_orig);
}
}
/*
* Remove any duplicates of the processed device from
* the list of all devices. If they were left in the
* list of all devices, they would be considered
* "missed" at the end.
*/
if (process_all_pvs && lvmcache_found_duplicate_pvs()) {
while ((dil = _device_list_find_pvid(all_devices, pv))) {
log_very_verbose("Skip duplicate device %s of processed device %s",
dev_name(dil->dev), dev_name(pv->dev));
_device_list_remove(all_devices, dil->dev);
}
}
}
/*
@ -3160,7 +3178,7 @@ int process_each_pv(struct cmd_context *cmd,
dm_list_init(&arg_missed_orig);
_device_list_copy(cmd, &arg_missed, &arg_missed_orig);
log_warn("Some PVs were not found in first search, retrying.");
log_verbose("Some PVs were not found in first search, retrying.");
lvmcache_destroy(cmd, 0, 0);
lvmcache_init();