mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-02 01:18:26 +03:00
Fix pvmove --abort to work even for empty pvmove LV
If pvmove crashed and metadata contains pvmove LV but without miorrored segments, pvmove --abort will not repair the situation (and finish wth success!). Fix it by allowing metadata update if aborting (thus removing pvmove LV) even if no moved LVs detected. (Tested on real metadata provided by an lvm user:-)
This commit is contained in:
parent
9c179ef418
commit
cf704d22b6
@ -1,5 +1,6 @@
|
||||
Version 2.02.74 -
|
||||
==================================
|
||||
Fix pvmove --abort to remove even for empty pvmove LV.
|
||||
Add configure --with-default-data-alignment.
|
||||
Update heuristic used for default and detected data alignment.
|
||||
Add "devices/default_data_alignment" to lvm.conf.
|
||||
|
@ -234,8 +234,10 @@ static int _poll_vg(struct cmd_context *cmd, const char *vgname,
|
||||
lv = lvl->lv;
|
||||
if (!(lv->status & parms->lv_type))
|
||||
continue;
|
||||
if (!(name = parms->poll_fns->get_copy_name_from_lv(lv)))
|
||||
name = parms->poll_fns->get_copy_name_from_lv(lv);
|
||||
if (!name && !parms->aborting)
|
||||
continue;
|
||||
|
||||
/* FIXME Need to do the activation from _set_up_pvmove here
|
||||
* if it's not running and we're not aborting */
|
||||
if (_check_lv_status(cmd, vg, lv, name, parms, &finished) &&
|
||||
|
@ -520,7 +520,8 @@ static int _finish_pvmove(struct cmd_context *cmd, struct volume_group *vg,
|
||||
{
|
||||
int r = 1;
|
||||
|
||||
if (!_detach_pvmove_mirror(cmd, lv_mirr)) {
|
||||
if (!dm_list_empty(lvs_changed) &&
|
||||
!_detach_pvmove_mirror(cmd, lv_mirr)) {
|
||||
log_error("ABORTING: Removal of temporary mirror failed");
|
||||
return 0;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user