mirror of
git://sourceware.org/git/lvm2.git
synced 2025-11-16 04:23:50 +03:00
Change vg_create() to take only minimal parameters and obtain a lock.
vg_t *vg_create(struct cmd_context *cmd, const char *vg_name); This is the first step towards the API called to create a VG. Call vg_lock_newname() inside this function. Use _vg_make_handle() where possible. Now we have 2 ways to construct a volume group: 1) vg_read: Used when constructing an existing VG from disks 2) vg_create: Used when constructing a new VG Both of these interfaces obtain a lock, and return a vg_t *. The usage of _vg_make_handle() inside vg_create() doesn't fit perfectly but it's ok for now. Needs some cleanup though and I've noted "FIXME" in the code. Add the new vg_create() plus vg 'set' functions for non-default VG parameters in the following tools: - vgcreate: Fairly straightforward refactoring. We just moved vg_lock_newname inside vg_create so we check the return via vg_read_error. - vgsplit: The refactoring here is a bit more tricky. Originally we called vg_lock_newname and depending on the error code, we either read the existing vg or created the new one. Now vg_create() calls vg_lock_newname, so we first try to create the VG. If this fails with FAILED_EXIST, we can then do the vg_read. If the create succeeds, we check the input parameters and set any new values on the VG. TODO in future patches: 1. The VG_ORPHAN lock needs some thought. We may want to treat this as any other VG, and require the application to obtain a handle and pass it to other API calls (for example, vg_extend). Or, we may find that hiding the VG_ORPHAN lock inside other APIs is the way to go. I thought of placing the VG_ORPHAN lock inside vg_create() and tying it to the vg handle, but was not certain this was the right approach. 2. Cleanup error paths. Integrate vg_read_error() with vg_create and vg_read* error codes and/or the new error APIs. Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
This commit is contained in:
@@ -46,22 +46,26 @@ int vgcreate(struct cmd_context *cmd, int argc, char **argv)
|
||||
if (validate_vg_create_params(cmd, &vp_new))
|
||||
return EINVALID_CMD_LINE;
|
||||
|
||||
/* FIXME: orphan lock needs tied to vg handle or inside library call */
|
||||
if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE)) {
|
||||
log_error("Can't get lock for orphan PVs");
|
||||
return ECMD_FAILED;
|
||||
}
|
||||
|
||||
if (vg_lock_newname(cmd, vp_new.vg_name) != SUCCESS) {
|
||||
log_error("Can't get lock for %s", vp_new.vg_name);
|
||||
unlock_vg(cmd, VG_ORPHANS);
|
||||
return ECMD_FAILED;
|
||||
}
|
||||
|
||||
/* Create the new VG */
|
||||
if (!(vg = vg_create(cmd, vp_new.vg_name, vp_new.extent_size,
|
||||
vp_new.max_pv, vp_new.max_lv, vp_new.alloc,
|
||||
argc - 1, argv + 1)))
|
||||
goto bad;
|
||||
vg = vg_create(cmd, vp_new.vg_name);
|
||||
if (vg_read_error(vg))
|
||||
goto_bad;
|
||||
|
||||
if (!vg_set_extent_size(vg, vp_new.extent_size) ||
|
||||
!vg_set_max_lv(vg, vp_new.max_lv) ||
|
||||
!vg_set_max_pv(vg, vp_new.max_pv) ||
|
||||
!vg_set_alloc_policy(vg, vp_new.alloc))
|
||||
goto_bad;
|
||||
|
||||
/* attach the pv's */
|
||||
if (!vg_extend(vg, argc - 1, argv + 1))
|
||||
goto_bad;
|
||||
|
||||
if (vp_new.max_lv != vg->max_lv)
|
||||
log_warn("WARNING: Setting maxlogicalvolumes to %d "
|
||||
|
||||
Reference in New Issue
Block a user