shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-04-01 18:50:41 +03:00
Code Releases Activity

Split vg_remove_single into 2 functions - the second part commits to disk.

Browse Source 
Split vg_remove_single into vg_remove_check (mandatory checks before
vgremove) and vg_remove (do actual remove by committing to disk).

In liblvm, we'd like to provide an consistent API that allows multiple
changes in memory, then let lvm_vg_write() control the commit to disk.  In
some cases (for example, lvresize calls fsadm) this may not be possible.
However, since we are using an object model and dividing things into small
operations, the most logical model seems to be the lvm_vg_write model, and
handling the special cases as they arrive.  So as best as possible
we move towards this end.

A possible optimization would be to consolidate vg_remove (committing)
code with vgreduce code.  A second possible optimization is making vgreduce
of the last device equivalent to vgremove.  Today, lvm_vg_reduce fails if
vgreduce is called with the last device, but from an object model perspective
we could view this as equivalent to vgremove and allow it.  My gut feel is
we do not want to do this though.


Author: Dave Wysochanski <dwysocha@redhat.com>
This commit is contained in:
Dave Wysochanski 2009-09-02 21:39:29 +00:00
parent 940077d030
commit d50795ed09
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/metadata/metadata-exported.h
View File

@ -442,7 +442,8 @@ uint32_t pv_list_extents_free(const struct dm_list *pvh);
struct volume_group *vg_create(struct cmd_context *cmd, const char *vg_name);
int vg_remove_mdas(struct volume_group *vg);
int vg_remove_single(struct volume_group *vg);
int vg_remove_check(struct volume_group *vg);
int vg_remove(struct volume_group *vg);
int vg_rename(struct cmd_context *cmd, struct volume_group *vg,
const char *new_name);
int vg_extend(struct volume_group *vg, int pv_count, char **pv_names);

14
lib/metadata/metadata.c
View File

@ -468,12 +468,9 @@ int remove_lvs_in_vg(struct cmd_context *cmd,
return 1;
}
int vg_remove_single(struct volume_group *vg)
int vg_remove_check(struct volume_group *vg)
{
struct physical_volume *pv;
struct pv_list *pvl;
unsigned lv_count;
int ret = 1;
if (vg_read_error(vg) || vg_missing_pv_count(vg)) {
log_error("Volume group \"%s\" not found, is inconsistent "
@ -497,6 +494,15 @@ int vg_remove_single(struct volume_group *vg)
if (!archive(vg))
return 0;
return 1;
}
int vg_remove(struct volume_group *vg)
{
struct physical_volume *pv;
struct pv_list *pvl;
int ret = 1;
if (!lock_vol(vg->cmd, VG_ORPHANS, LCK_VG_WRITE)) {
log_error("Can't get lock for orphan PVs");
return 0;

5
liblvm/lvm_vg.c
View File

@ -153,7 +153,10 @@ int lvm_vg_remove(vg_t vg)
if (!vg_check_write_mode(vg))
return -1;
if (!vg_remove_single(vg))
if (!vg_remove_check(vg))
return -1;
if (!vg_remove(vg))
return -1;
return 0;
}

5
tools/vgremove.c
View File

@ -44,7 +44,10 @@ static int vgremove_single(struct cmd_context *cmd, const char *vg_name,
return ECMD_FAILED;
}
if (!vg_remove_single(vg))
if (!vg_remove_check(vg))
return ECMD_FAILED;
if (!vg_remove(vg))
return ECMD_FAILED;
return ECMD_PROCESSED;