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

Revert the patch for vgconvert to work with recent changes in metadata area handling.

Browse Source 
This should work now with the help of the patch from previous commit.
This commit is contained in:
Peter Rajnoha 2011-02-25 14:02:53 +00:00
parent 38b0564cab
commit f74bd57ec9
4 changed files with 67 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -2,7 +2,6 @@ Version 2.02.85 -
===================================
Fix metadata balance code to work with recent changes in metadata handling.
Add old_uuid field to physical_volume and fix pvchange -u for recent changes.
Fix vgconvert to work with recent changes in metadata handling.
Allow pvresize on a PV with two metadata areas.
Change pvcreate to use new metadata handling interface.
Restructure existing pv_setup and pv_write fn, add pv_initialise fn.

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

@ -442,9 +442,6 @@ void vg_remove_pvs(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_convert(struct cmd_context *cmd, struct volume_group *vg,
const struct format_type *target_fmt, int64_t label_sector,
int pvmetadatacopies, uint64_t pvmetadatasize);
int vg_extend(struct volume_group *vg, int pv_count, const char *const *pv_names,
struct pvcreate_params *pp);
int vg_reduce(struct volume_group *vg, const char *pv_name);

103
lib/metadata/metadata.c
View File

@ -496,109 +496,6 @@ int vg_rename(struct cmd_context *cmd, struct volume_group *vg,
return 1;
}
int vg_convert(struct cmd_context *cmd, struct volume_group *vg,
const struct format_type *target_fmt, int64_t label_sector,
int pvmetadatacopies, uint64_t pvmetadatasize)
{
struct physical_volume *pv, *existing_pv;
struct format_instance_ctx fic;
uint64_t pe_start = 0;
struct pv_list *pvl;
int change_made = 0;
const char *vg_name = vg->name;
/* Replace an old format instance with a new empty one. */
vg->fid->fmt->ops->destroy_instance(vg->fid);
fic.type = FMT_INSTANCE_VG | FMT_INSTANCE_AUX_MDAS;
fic.context.vg_ref.vg_name = vg_name;
fic.context.vg_ref.vg_id = NULL;
if (!(vg->fid = target_fmt->ops->create_instance(target_fmt, &fic))) {
log_error("Couldn't create target format instance "
"for VG %s.", vg_name);
return 0;
}
/*
* Create new PVs in target format taking original PVs as coimage.
* Write the new PVs out and replace the old PVs in VG structure
* with the new PVs.
*/
dm_list_iterate_items(pvl, &vg->pvs) {
existing_pv = pvl->pv;
pe_start = pv_pe_start(existing_pv);
if (!(pv = pv_create(cmd, pv_dev(existing_pv),
&existing_pv->id,
0, 0, 0, pe_start,
pv_pe_count(existing_pv),
pv_pe_size(existing_pv),
label_sector, pvmetadatacopies,
pvmetadatasize, 0))) {
log_error("Failed to setup physical volume \"%s\"",
pv_dev_name(existing_pv));
if (change_made)
goto revert;
return 0;
}
/* Need to revert manually if it fails after this point */
change_made = 1;
log_verbose("Set up physical volume for \"%s\" with %" PRIu64
" available sectors", pv_dev_name(pv), pv_size(pv));
/* Wipe existing label first */
if (!label_remove(pv_dev(pv))) {
log_error("Failed to wipe existing label on %s",
pv_dev_name(pv));
}
log_very_verbose("Writing physical volume data to disk \"%s\"",
pv_dev_name(pv));
/* FIXME: This pv_write will change the VG assignment for the
* PV info in the cache to orphan VG! We should just change
* the existing VG format information in the cache or throw
* the cache away after this pv_write. */
if (!(pv_write(cmd, pv))) {
log_error("Failed to write physical volume \"%s\"",
pv_dev_name(pv));
goto revert;
}
log_verbose("Physical volume \"%s\" successfully created",
pv_dev_name(pv));
if (!vg->fid->fmt->ops->pv_setup(vg->fid->fmt, pv, vg)) {
log_error("Failed to setup PV %s in new format for VG %s.",
pv_dev_name(pv), vg_name);
goto revert;
}
/* FIXME: Free the mem used by the old PV structure? */
/* Copy relevant fields from old PV and further initialise new PV. */
pv->vg = vg;
if (!(pv->vg_name = dm_pool_strdup(vg->vgmem, vg_name))) {
log_error("vg->name allocation failed for %s",pv_dev_name(pv));
goto revert;
}
memcpy(&pv->vgid, &vg->id, sizeof(vg->id));
if (!alloc_pv_segment_whole_pv(vg->vgmem, pv)) {
log_error("pv->segments allocation failed for %s", pv_dev_name(pv));
goto revert;
}
pvl->pv = pv;
}
return 1;
revert:
log_error("Use pvcreate and vgcfgrestore to repair "
"from archived metadata.");
return 0;
}
int remove_lvs_in_vg(struct cmd_context *cmd,
struct volume_group *vg,
force_t force)

87
tools/vgconvert.c
View File

@ -19,11 +19,14 @@ static int vgconvert_single(struct cmd_context *cmd, const char *vg_name,
struct volume_group *vg,
void *handle __attribute__((unused)))
{
const struct format_type *target_fmt = cmd->fmt;
struct physical_volume *pv, *existing_pv;
struct logical_volume *lv;
struct lv_list *lvl;
int pvmetadatacopies = 0;
uint64_t pvmetadatasize = 0;
uint64_t pe_start = 0;
struct pv_list *pvl;
int change_made = 0;
struct lvinfo info;
int active = 0;
@ -32,13 +35,13 @@ static int vgconvert_single(struct cmd_context *cmd, const char *vg_name,
return ECMD_FAILED;
}
if (vg->fid->fmt == target_fmt) {
if (vg->fid->fmt == cmd->fmt) {
log_error("Volume group \"%s\" already uses format %s",
vg_name, cmd->fmt->name);
return ECMD_FAILED;
}
if (target_fmt->features & FMT_MDAS) {
if (cmd->fmt->features & FMT_MDAS) {
if (arg_sign_value(cmd, metadatasize_ARG, 0) == SIGN_MINUS) {
log_error("Metadata size may not be negative");
return EINVALID_CMD_LINE;
@ -67,7 +70,7 @@ static int vgconvert_single(struct cmd_context *cmd, const char *vg_name,
/* Set PV/LV limit if converting from unlimited metadata format */
if (vg->fid->fmt->features & FMT_UNLIMITED_VOLS &&
!(target_fmt->features & FMT_UNLIMITED_VOLS)) {
!(cmd->fmt->features & FMT_UNLIMITED_VOLS)) {
if (!vg->max_lv)
vg->max_lv = 255;
if (!vg->max_pv)
@ -76,7 +79,7 @@ static int vgconvert_single(struct cmd_context *cmd, const char *vg_name,
/* If converting to restricted lvid, check if lvid is compatible */
if (!(vg->fid->fmt->features & FMT_RESTRICTED_LVIDS) &&
target_fmt->features & FMT_RESTRICTED_LVIDS)
cmd->fmt->features & FMT_RESTRICTED_LVIDS)
dm_list_iterate_items(lvl, &vg->lvs)
if (!lvid_in_restricted_range(&lvl->lv->lvid)) {
log_error("Logical volume %s lvid format is"
@ -86,7 +89,7 @@ static int vgconvert_single(struct cmd_context *cmd, const char *vg_name,
}
/* Attempt to change any LVIDs that are too big */
if (target_fmt->features & FMT_RESTRICTED_LVIDS) {
if (cmd->fmt->features & FMT_RESTRICTED_LVIDS) {
dm_list_iterate_items(lvl, &vg->lvs) {
lv = lvl->lv;
if (lv->status & SNAPSHOT)
@ -110,18 +113,65 @@ static int vgconvert_single(struct cmd_context *cmd, const char *vg_name,
return ECMD_FAILED;
}
dm_list_iterate_items(pvl, &vg->pvs) {
existing_pv = pvl->pv;
pe_start = pv_pe_start(existing_pv);
/* pe_end = pv_pe_count(existing_pv) * pv_pe_size(existing_pv) + pe_start - 1; */
if (!(pv = pv_create(cmd, pv_dev(existing_pv),
&existing_pv->id, 0, 0, 0,
pe_start, pv_pe_count(existing_pv),
pv_pe_size(existing_pv),
arg_int64_value(cmd, labelsector_ARG,
DEFAULT_LABELSECTOR),
pvmetadatacopies, pvmetadatasize, 0))) {
log_error("Failed to setup physical volume \"%s\"",
pv_dev_name(existing_pv));
if (change_made)
log_error("Use pvcreate and vgcfgrestore to "
"repair from archived metadata.");
return ECMD_FAILED;
}
/* Need to revert manually if it fails after this point */
change_made = 1;
log_verbose("Set up physical volume for \"%s\" with %" PRIu64
" available sectors", pv_dev_name(pv), pv_size(pv));
/* Wipe existing label first */
if (!label_remove(pv_dev(pv))) {
log_error("Failed to wipe existing label on %s",
pv_dev_name(pv));
log_error("Use pvcreate and vgcfgrestore to repair "
"from archived metadata.");
return ECMD_FAILED;
}
log_very_verbose("Writing physical volume data to disk \"%s\"",
pv_dev_name(pv));
if (!(pv_write(cmd, pv))) {
log_error("Failed to write physical volume \"%s\"",
pv_dev_name(pv));
log_error("Use pvcreate and vgcfgrestore to repair "
"from archived metadata.");
return ECMD_FAILED;
}
log_verbose("Physical volume \"%s\" successfully created",
pv_dev_name(pv));
}
log_verbose("Deleting existing metadata for VG %s", vg_name);
if (!vg_remove_mdas(vg)) {
log_error("Removal of existing metadata for %s failed.",
vg_name);
goto revert;
log_error("Use pvcreate and vgcfgrestore to repair "
"from archived metadata.");
return ECMD_FAILED;
}
if (!vg_convert(cmd, vg, target_fmt, arg_int64_value(cmd,
labelsector_ARG, DEFAULT_LABELSECTOR),
pvmetadatacopies, pvmetadatasize))
goto revert;
/* FIXME Cache the label format change so we don't have to skip this */
if (test_mode()) {
log_verbose("Test mode: Skipping metadata writing for VG %s in"
@ -130,21 +180,18 @@ static int vgconvert_single(struct cmd_context *cmd, const char *vg_name,
}
log_verbose("Writing metadata for VG %s using format %s", vg_name,
target_fmt->name);
if (!vg_write(vg) || !vg_commit(vg)) {
cmd->fmt->name);
if (!backup_restore_vg(cmd, vg)) {
log_error("Conversion failed for volume group %s.", vg_name);
goto revert;
log_error("Use pvcreate and vgcfgrestore to repair from "
"archived metadata.");
return ECMD_FAILED;
}
log_print("Volume group %s successfully converted", vg_name);
backup(vg);
return ECMD_PROCESSED;
revert:
log_error("Use pvcreate and vgcfgrestore to repair "
"from archived metadata.");
return ECMD_FAILED;
}
int vgconvert(struct cmd_context *cmd, int argc, char **argv)