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

If pvmove fails activating mirror volume, try restore to previous state.

Browse Source 
pvmove now keep suspended devices if temporary mirror creation fails.

We can try to restore previous state if it is first attempt to activate
pvmove (code basically run the same code as --abort automatically).
This commit is contained in:
Milan Broz 2009-05-19 09:51:02 +00:00
parent e1b0dce76e
commit 65edd11bfb
3 changed files with 20 additions and 6 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.46 -
================================
Fix pvmove to revert operation if temporary mirror creation fails.
Fix metadata export for VG with missing PVs.
Add vgimportclone and install it and the man page by default.
Force max_lv restriction only for newly created LV.

5
test/t-pvmove-basic.sh
View File

@ -370,3 +370,8 @@ vgcreate $vg $devs
lvcreate -l4 -n $lv1 $vg $dev1
pvmove $dev1
#COMM "pvmove fails activating mirror, properly restores state before pvmove"
dmsetup create "$vg-pvmove0" --notable
not pvmove -i 1 $dev2
test $(dmsetup info --noheadings -c -o suspended "$vg-$lv1") = "Active"
dmsetup remove "$vg-pvmove0"

20
tools/pvmove.c
View File

@ -274,6 +274,10 @@ static int _activate_lv(struct cmd_context *cmd, struct logical_volume *lv_mirr,
return activate_lv(cmd, lv_mirr);
}
static int _finish_pvmove(struct cmd_context *cmd, struct volume_group *vg,
struct logical_volume *lv_mirr,
struct dm_list *lvs_changed);
static int _update_metadata(struct cmd_context *cmd, struct volume_group *vg,
struct logical_volume *lv_mirr,
struct dm_list *lvs_changed, unsigned flags)
@ -315,12 +319,16 @@ static int _update_metadata(struct cmd_context *cmd, struct volume_group *vg,
/* FIXME: Add option to use a log */
if (first_time) {
if (!_activate_lv(cmd, lv_mirr, exclusive)) {
if (!test_mode())
log_error("ABORTING: Temporary mirror "
"activation failed. "
"Run pvmove --abort.");
/* FIXME Resume using *original* metadata here! */
resume_lvs(cmd, lvs_changed);
if (test_mode())
goto out;
/*
* Nothing changed yet, try to revert pvmove.
*/
log_error("Temporary pvmove mirror activation failed.");
if (!_finish_pvmove(cmd, vg, lv_mirr, lvs_changed))
log_error("ABORTING: Restoring original configuration "
"before pvmove failed. Run pvmove --abort.");
goto out;
}
} else if (!resume_lv(cmd, lv_mirr)) {