From 0e8fdf49d09b17fb10c6f722e150b5592e5ffb54 Mon Sep 17 00:00:00 2001 From: Petr Rockai Date: Mon, 15 Jun 2009 14:47:39 +0000 Subject: [PATCH] - Ignore suspended devices during repair (Milan). - Call vgreduce --removemissing (without --force) automatically to clean up bad PVs (Milan). --- daemons/dmeventd/plugins/mirror/dmeventd_mirror.c | 6 ++++++ tools/lvconvert.c | 7 ++++++- tools/vgreduce.c | 5 +++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c index 4c9fcf5c4..ab7591d3f 100644 --- a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c +++ b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c @@ -161,6 +161,12 @@ static int _remove_failed_devices(const char *device) r = lvm2_run(_lvm_handle, cmd_str); + if (r == 1) { + snprintf(cmd_str, CMD_SIZE, "vgreduce --removemissing %s", vg); + if (lvm2_run(_lvm_handle, cmd_str) != 1) + syslog(LOG_ERR, "Unable to remove failed PVs from VG %s", vg); + } + dm_pool_empty(_mem_pool); /* FIXME: not safe with multiple threads */ return (r == 1) ? 0 : -1; } diff --git a/tools/lvconvert.c b/tools/lvconvert.c index 73aa6b275..b3d4d0686 100644 --- a/tools/lvconvert.c +++ b/tools/lvconvert.c @@ -926,18 +926,22 @@ int lvconvert(struct cmd_context * cmd, int argc, char **argv) struct lvconvert_params lp; int ret = ECMD_FAILED; struct lvinfo info; + int saved_ignore_suspended_devices = ignore_suspended_devices(); if (!_read_params(&lp, cmd, argc, argv)) { stack; return EINVALID_CMD_LINE; } + if (arg_count(cmd, repair_ARG)) + init_ignore_suspended_devices(1); + log_verbose("Checking for existing volume group \"%s\"", lp.vg_name); if (!(vg = vg_lock_and_read(cmd, lp.vg_name, NULL, LCK_VG_WRITE, CLUSTERED | EXPORTED_VG | LVM_WRITE, CORRECT_INCONSISTENT))) - return ECMD_FAILED; + goto out; if (!(lvl = find_lv_in_vg(vg, lp.lv_name))) { log_error("Logical volume \"%s\" not found in " @@ -966,6 +970,7 @@ bad: lp.wait_completion ? 0 : 1U); } out: + init_ignore_suspended_devices(saved_ignore_suspended_devices); vg_release(vg); return ret; } diff --git a/tools/vgreduce.c b/tools/vgreduce.c index 014d33793..1428a991d 100644 --- a/tools/vgreduce.c +++ b/tools/vgreduce.c @@ -466,6 +466,7 @@ int vgreduce(struct cmd_context *cmd, int argc, char **argv) int consistent = 1; int fixed = 1; int repairing = arg_count(cmd, removemissing_ARG); + int saved_ignore_suspended_devices = ignore_suspended_devices(); if (!argc && !repairing) { log_error("Please give volume group name and " @@ -515,6 +516,9 @@ int vgreduce(struct cmd_context *cmd, int argc, char **argv) return ECMD_FAILED; } + if (repairing) + init_ignore_suspended_devices(1); + if ((!(vg = vg_read_internal(cmd, vg_name, NULL, &consistent)) || !consistent) && !repairing) { log_error("Volume group \"%s\" doesn't exist", vg_name); @@ -574,6 +578,7 @@ int vgreduce(struct cmd_context *cmd, int argc, char **argv) } out: + init_ignore_suspended_devices(saved_ignore_suspended_devices); unlock_and_release_vg(cmd, vg, vg_name); return ret; -- 2.43.5