From bda6449118bafe79ec9f2e916a6af1b44ef04065 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 23 Aug 2010 11:34:10 +0000 Subject: [PATCH] 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:-) --- WHATS_NEW | 1 + tools/polldaemon.c | 4 +++- tools/pvmove.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index f3f1d27af..04c362b73 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -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. diff --git a/tools/polldaemon.c b/tools/polldaemon.c index d51f4bb1c..147d5320d 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -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) && diff --git a/tools/pvmove.c b/tools/pvmove.c index c8a480fdd..0346ca347 100644 --- a/tools/pvmove.c +++ b/tools/pvmove.c @@ -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; } -- 2.43.5