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

Attempt to remove incomplete LVs with lvcreate zeroing/activation problems.

Browse Source
This commit is contained in:
Alasdair Kergon 2007-11-12 13:34:14 +00:00
parent 14772580cd
commit df322f0ba1
2 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.29 - Version 2.02.29 -
================================== ==================================
Attempt to remove incomplete LVs with lvcreate zeroing/activation problems.
Add activation/readahead configuration option and FMT_RESTRICTED_READAHEAD. Add activation/readahead configuration option and FMT_RESTRICTED_READAHEAD.
Extend readahead arg to accept "auto" and "none". Extend readahead arg to accept "auto" and "none".
Add lv_read_ahead and lv_kernel_read_ahead fields to reports. Add lv_read_ahead and lv_kernel_read_ahead fields to reports.

72
tools/lvcreate.c
View File

@ -249,7 +249,7 @@ static int _read_stripe_params(struct lvcreate_params *lp,
* Generic mirror parameter checks. * Generic mirror parameter checks.
* FIXME: Should eventually be moved into lvm library. * FIXME: Should eventually be moved into lvm library.
*/ */
static int _validate_mirror_params(const struct cmd_context *cmd, static int _validate_mirror_params(const struct cmd_context *cmd __attribute((unused)),
const struct lvcreate_params *lp) const struct lvcreate_params *lp)
{ {
int pagesize = lvm_getpagesize(); int pagesize = lvm_getpagesize();
@ -638,6 +638,12 @@ static int _lvcreate(struct cmd_context *cmd, struct lvcreate_params *lp)
lp->extents = lp->extents - size_rest + lp->stripes; lp->extents = lp->extents - size_rest + lp->stripes;
} }
if (lp->zero && !activation) {
log_error("Can't wipe start of new LV without using "
"device-mapper kernel driver");
return 0;
}
if (lp->snapshot) { if (lp->snapshot) {
if (!activation()) { if (!activation()) {
log_error("Can't create snapshot without using " log_error("Can't create snapshot without using "
@ -811,45 +817,41 @@ static int _lvcreate(struct cmd_context *cmd, struct lvcreate_params *lp)
alloc_destroy(ah); alloc_destroy(ah);
ah = NULL; ah = NULL;
} else if (!lv_extend(lv, lp->segtype, lp->stripes, lp->stripe_size, } else if (!lv_extend(lv, lp->segtype, lp->stripes, lp->stripe_size,
lp->mirrors, lp->extents, NULL, 0u, 0u, pvh, lp->alloc)) { lp->mirrors, lp->extents, NULL, 0u, 0u, pvh, lp->alloc))
stack; return_0;
return 0;
}
/* store vg on disk(s) */ /* store vg on disk(s) */
if (!vg_write(vg)) { if (!vg_write(vg))
stack; return_0;
return 0;
}
backup(vg); backup(vg);
if (!vg_commit(vg)) { if (!vg_commit(vg))
stack; return_0;
return 0;
}
if (lp->snapshot) { if (lp->snapshot) {
if (!activate_lv_excl(cmd, lv)) { if (!activate_lv_excl(cmd, lv)) {
log_error("Aborting. Failed to activate snapshot " log_error("Aborting. Failed to activate snapshot "
"exception store. Remove new LV and retry."); "exception store.");
return 0; goto revert_new_lv;
} }
} else if (!activate_lv(cmd, lv)) { } else if (!activate_lv(cmd, lv)) {
if (lp->zero) {
log_error("Aborting. Failed to activate new LV to wipe "
"the start of it.");
goto revert_new_lv;
}
log_error("Failed to activate new LV."); log_error("Failed to activate new LV.");
return 0; return 0;
} }
if ((lp->zero || lp->snapshot) && activation()) { if (!lp->zero && !lp->snapshot)
if (!set_lv(cmd, lv, UINT64_C(0), 0) && lp->snapshot) {
/* FIXME Remove the failed lv we just added */
log_error("Aborting. Failed to wipe snapshot "
"exception store. Remove new LV and retry.");
return 0;
}
} else {
log_error("WARNING: \"%s\" not zeroed", lv->name); log_error("WARNING: \"%s\" not zeroed", lv->name);
/* FIXME Remove the failed lv we just added */ else if (!set_lv(cmd, lv, UINT64_C(0), 0)) {
log_error("Aborting. Failed to wipe %s.",
lp->snapshot ? "snapshot exception store" :
"start of new LV");
goto deactivate_and_revert_new_lv;
} }
if (lp->snapshot) { if (lp->snapshot) {
@ -860,7 +862,7 @@ static int _lvcreate(struct cmd_context *cmd, struct lvcreate_params *lp)
/* COW area must be deactivated if origin is not active */ /* COW area must be deactivated if origin is not active */
if (!origin_active && !deactivate_lv(cmd, lv)) { if (!origin_active && !deactivate_lv(cmd, lv)) {
log_error("Aborting. Couldn't deactivate snapshot " log_error("Aborting. Couldn't deactivate snapshot "
"COW area."); "COW area. Manual intervention required.");
return 0; return 0;
} }
@ -868,13 +870,13 @@ static int _lvcreate(struct cmd_context *cmd, struct lvcreate_params *lp)
if (!vg_add_snapshot(NULL, org, lv, NULL, if (!vg_add_snapshot(NULL, org, lv, NULL,
org->le_count, lp->chunk_size)) { org->le_count, lp->chunk_size)) {
log_err("Couldn't create snapshot."); log_error("Couldn't create snapshot.");
return 0; return 0;
} }
/* store vg on disk(s) */ /* store vg on disk(s) */
if (!vg_write(vg)) if (!vg_write(vg))
return 0; return_0;
if (!suspend_lv(cmd, org)) { if (!suspend_lv(cmd, org)) {
log_error("Failed to suspend origin %s", org->name); log_error("Failed to suspend origin %s", org->name);
@ -883,7 +885,7 @@ static int _lvcreate(struct cmd_context *cmd, struct lvcreate_params *lp)
} }
if (!vg_commit(vg)) if (!vg_commit(vg))
return 0; return_0;
if (!resume_lv(cmd, org)) { if (!resume_lv(cmd, org)) {
log_error("Problem reactivating origin %s", org->name); log_error("Problem reactivating origin %s", org->name);
@ -906,6 +908,20 @@ error:
if (ah) if (ah)
alloc_destroy(ah); alloc_destroy(ah);
return 0; return 0;
deactivate_and_revert_new_lv:
if (!deactivate_lv(cmd, lv)) {
log_error("Unable to deactivate failed new LV. "
"Manual intervention required.");
return 0;
}
revert_new_lv:
/* FIXME Better to revert to backup of metadata? */
if (!lv_remove(lv) || !vg_write(vg) || backup(vg), !vg_commit(vg))
log_error("Manual intervention may be required to remove "
"abandoned LV(s) before retrying.");
return 0;
} }
int lvcreate(struct cmd_context *cmd, int argc, char **argv) int lvcreate(struct cmd_context *cmd, int argc, char **argv)