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

lvrename: support renaming historical logical volumes

Browse Source
This commit is contained in:
Peter Rajnoha 2016-03-04 11:36:24 +01:00
parent b114b4d723
commit 27245d97e5
2 changed files with 98 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/metadata/lv_manip.c
View File

@ -4196,6 +4196,7 @@ int lv_rename_update(struct cmd_context *cmd, struct logical_volume *lv,
{ {
struct volume_group *vg = lv->vg; struct volume_group *vg = lv->vg;
struct lv_names lv_names = { .old = lv->name }; struct lv_names lv_names = { .old = lv->name };
int old_lv_is_historical = lv_is_historical(lv);
int historical; int historical;
/* /*
@ -4210,7 +4211,7 @@ int lv_rename_update(struct cmd_context *cmd, struct logical_volume *lv,
if (lv_name_is_used_in_vg(vg, new_name, &historical)) { if (lv_name_is_used_in_vg(vg, new_name, &historical)) {
log_error("%sLogical Volume \"%s\" already exists in " log_error("%sLogical Volume \"%s\" already exists in "
"volume group \"%s\"", historical ? "historical " : "", "volume group \"%s\"", historical ? "Historical " : "",
new_name, vg->name); new_name, vg->name);
return 0; return 0;
} }
@ -4223,24 +4224,32 @@ int lv_rename_update(struct cmd_context *cmd, struct logical_volume *lv,
if (update_mda && !archive(vg)) if (update_mda && !archive(vg))
return_0; return_0;
if (!(lv_names.new = dm_pool_strdup(cmd->mem, new_name))) { if (old_lv_is_historical) {
log_error("Failed to allocate space for new name."); /* historical LVs don't have sub LVs */
return 0; lv->this_glv->historical->name = lv->name = new_name;
if (update_mda &&
(!vg_write(vg) || !vg_commit(vg)))
return_0;
} else {
if (!(lv_names.new = dm_pool_strdup(cmd->mem, new_name))) {
log_error("Failed to allocate space for new name.");
return 0;
}
/* rename sub LVs */
if (!for_each_sub_lv_except_pools(lv, _rename_cb, (void *) &lv_names))
return_0;
/* rename main LV */
lv->name = lv_names.new;
if (lv_is_cow(lv))
lv = origin_from_cow(lv);
if (update_mda && !lv_update_and_reload((struct logical_volume *)lv_lock_holder(lv)))
return_0;
} }
/* rename sub LVs */
if (!for_each_sub_lv_except_pools(lv, _rename_cb, (void *) &lv_names))
return_0;
/* rename main LV */
lv->name = lv_names.new;
if (lv_is_cow(lv))
lv = origin_from_cow(lv);
if (update_mda && !lv_update_and_reload((struct logical_volume *)lv_lock_holder(lv)))
return_0;
return 1; return 1;
} }

92
tools/lvrename.c
View File

@ -16,34 +16,64 @@
#include "tools.h" #include "tools.h"
struct lvrename_params { struct lvrename_params {
int historical;
const char *lv_name_old; const char *lv_name_old;
const char *lv_name_new; const char *lv_name_new;
}; };
/*
* Dummy LV to represent historical LV.
*/
static struct logical_volume _historical_lv = {
.name = "",
.major = -1,
.minor = -1,
.snapshot_segs = DM_LIST_HEAD_INIT(_historical_lv.snapshot_segs),
.segments = DM_LIST_HEAD_INIT(_historical_lv.segments),
.tags = DM_LIST_HEAD_INIT(_historical_lv.tags),
.segs_using_this_lv = DM_LIST_HEAD_INIT(_historical_lv.segs_using_this_lv),
.indirect_glvs = DM_LIST_HEAD_INIT(_historical_lv.indirect_glvs),
.hostname = "",
};
static int _lvrename_single(struct cmd_context *cmd, const char *vg_name, static int _lvrename_single(struct cmd_context *cmd, const char *vg_name,
struct volume_group *vg, struct processing_handle *handle) struct volume_group *vg, struct processing_handle *handle)
{ {
struct lvrename_params *lp = (struct lvrename_params *) handle->custom_handle; struct lvrename_params *lp = (struct lvrename_params *) handle->custom_handle;
struct lv_list *lvl; struct generic_logical_volume *glv;
struct logical_volume *lv;
int ret = ECMD_FAILED; int ret = ECMD_FAILED;
if (!(lvl = find_lv_in_vg(vg, lp->lv_name_old))) { if (!lp->historical) {
log_error("Existing logical volume \"%s\" not found in " if (!(lv = find_lv(vg, lp->lv_name_old))) {
"volume group \"%s\"", lp->lv_name_old, vg_name); log_error("Existing logical volume \"%s\" not found in "
goto bad; "volume group \"%s\"", lp->lv_name_old, vg_name);
} goto bad;
}
if (lv_is_raid_image(lvl->lv) || lv_is_raid_metadata(lvl->lv)) { if (lv_is_raid_image(lv) || lv_is_raid_metadata(lv)) {
log_error("Cannot rename a RAID %s directly", log_error("Cannot rename a RAID %s directly",
lv_is_raid_image(lvl->lv) ? "image" : lv_is_raid_image(lv) ? "image" :
"metadata area"); "metadata area");
goto bad; goto bad;
} }
if (lv_is_raid_with_tracking(lvl->lv)) { if (lv_is_raid_with_tracking(lv)) {
log_error("Cannot rename %s while it is tracking a split image", log_error("Cannot rename %s while it is tracking a split image",
lvl->lv->name); lv->name);
goto bad; goto bad;
}
} else {
if (!(glv = find_historical_glv(vg, lp->lv_name_old, 0, NULL))) {
log_error("Existing historical logical volume \"%s\" not found in "
"volume group \"%s\"", lp->lv_name_old, vg_name);
goto bad;
}
_historical_lv.vg = vg;
_historical_lv.name = lp->lv_name_old;
_historical_lv.this_glv = glv;
lv = &_historical_lv;
} }
/* /*
@ -55,14 +85,16 @@ static int _lvrename_single(struct cmd_context *cmd, const char *vg_name,
* lock request acquires the LV lock (or fails). The transient lock * lock request acquires the LV lock (or fails). The transient lock
* is automatically released when the command exits. * is automatically released when the command exits.
*/ */
if (!lockd_lv(cmd, lvl->lv, "ex", 0)) if (!lockd_lv(cmd, lv, "ex", 0))
goto_bad; goto_bad;
if (!lv_rename(cmd, lvl->lv, lp->lv_name_new)) if (!lv_rename(cmd, lv, lp->lv_name_new))
goto_bad; goto_bad;
log_print_unless_silent("Renamed \"%s\" to \"%s\" in volume group \"%s\"", log_print_unless_silent("Renamed \"%s%s\" to \"%s%s\" in volume group \"%s\"",
lp->lv_name_old, lp->lv_name_new, vg_name); lp->historical ? HISTORICAL_LV_PREFIX : "", lp->lv_name_old,
lp->historical ? HISTORICAL_LV_PREFIX : "", lp->lv_name_new,
vg_name);
ret = ECMD_PROCESSED; ret = ECMD_PROCESSED;
bad: bad:
@ -80,9 +112,12 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)
size_t maxlen; size_t maxlen;
char *lv_name_old, *lv_name_new; char *lv_name_old, *lv_name_new;
const char *vg_name, *vg_name_new, *vg_name_old; const char *vg_name, *vg_name_new, *vg_name_old;
int historical = 0;
char *st; char *st;
int ret; int ret;
cmd->include_historical_lvs = 1;
if (argc == 3) { if (argc == 3) {
vg_name = skip_dev_dir(cmd, argv[0], NULL); vg_name = skip_dev_dir(cmd, argv[0], NULL);
lv_name_old = argv[1]; lv_name_old = argv[1];
@ -123,6 +158,21 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)
if ((st = strrchr(lv_name_new, '/'))) if ((st = strrchr(lv_name_new, '/')))
lv_name_new = st + 1; lv_name_new = st + 1;
if (!strncmp(lv_name_old, HISTORICAL_LV_PREFIX, strlen(HISTORICAL_LV_PREFIX))) {
lv_name_old = lv_name_old + strlen(HISTORICAL_LV_PREFIX);
historical = 1;
}
if (!strncmp(lv_name_new, HISTORICAL_LV_PREFIX, strlen(HISTORICAL_LV_PREFIX))) {
if (historical)
lv_name_new = lv_name_old + strlen(HISTORICAL_LV_PREFIX);
else {
log_error("Old name references live LV while "
"new name is for historical LV.");
return EINVALID_CMD_LINE;
}
}
/* Check sanity of new name */ /* Check sanity of new name */
maxlen = NAME_LEN - strlen(vg_name) - 3; maxlen = NAME_LEN - strlen(vg_name) - 3;
if (strlen(lv_name_new) > maxlen) { if (strlen(lv_name_new) > maxlen) {
@ -152,6 +202,8 @@ int lvrename(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE; return EINVALID_CMD_LINE;
} }
lp.historical = historical;
if (!(lp.lv_name_old = dm_pool_strdup(cmd->mem, lv_name_old))) if (!(lp.lv_name_old = dm_pool_strdup(cmd->mem, lv_name_old)))
return ECMD_FAILED; return ECMD_FAILED;