shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-26 22:50:36 +03:00
Code Releases Activity

vgremove: select: direct selection to be done per-VG, not per-LV

Browse Source 
Though vgremove operates per VG by definition, internally, it
actually means iterating over each LV it contains to do the
remove.

So we need to direct selection a bit in this case so that the
selection is done per-VG, not per-LV.

That means, use processing handle with void_handle.internal_report_for_select=0
for the process_each_lv_in_vg that is called later in vgremove_single fn.
We need to disable internal selection for process_each_lv_in_vg
here as selection is already done by process_each_vg which calls
vgremove_single. Otherwise selection would be done per-LV and not
per-VG as we intend!

An intra-release fix for commit 00744b053f395be79ab1cb80fdf7342548aa79e2.
This commit is contained in:
Peter Rajnoha 2015-03-04 10:44:31 +01:00
parent bfbb5d269a
commit e73dad7874
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/shell/select-tools.sh
View File

@ -263,3 +263,13 @@ not check pv_field $dev2 pv_tags "309,tag"
not check pv_field $dev3 pv_tags "309,tag"
not check pv_field $dev4 pv_tags "309,tag"
pvchange -a --deltag 309 --deltag tag
#########################
# special cases to test #
#########################
# if calling vgremove, make sure we're doing selection per-VG, not per-LV
# (vgremove calls process_each_vg with vgremove_single which itself
# iterates over LVs with process_each_lv_in_vg - so internally it actually
# operates per-LV, but we still need the selection to be done per-VG)
vgremove --yes -S 'lv_name=lv2' # should remove whole vg1, not just the lv2

16
tools/vgremove.c
View File

@ -19,6 +19,19 @@ static int vgremove_single(struct cmd_context *cmd, const char *vg_name,
struct volume_group *vg,
struct processing_handle *handle __attribute__((unused)))
{
/*
* Though vgremove operates per VG by definition, internally, it
* actually means iterating over each LV it contains to do the remove.
*
* Use processing handle with void_handle.internal_report_for_select=0
* for the process_each_lv_in_vg that is called later in this fn.
* We need to disable internal selection for process_each_lv_in_vg
* here as selection is already done by process_each_vg which calls
* vgremove_single. Otherwise selection would be done per-LV and
* not per-VG as we intend!
*/
struct processing_handle void_handle = {0};
/*
* Single force is equivalent to sinle --yes
* Even multiple --yes are equivalent to single --force
@ -47,7 +60,8 @@ static int vgremove_single(struct cmd_context *cmd, const char *vg_name,
return ECMD_FAILED;
}
}
if ((ret = process_each_lv_in_vg(cmd, vg, NULL, NULL, 1, NULL,
if ((ret = process_each_lv_in_vg(cmd, vg, NULL, NULL, 1, &void_handle,
(process_single_lv_fn_t)lvremove_single)) != ECMD_PROCESSED) {
stack;
return ret;