diff options
author | Petr Rockai <prockai@redhat.com> | 2009-06-15 14:47:39 +0000 |
---|---|---|
committer | Petr Rockai <prockai@redhat.com> | 2009-06-15 14:47:39 +0000 |
commit | 1f164ad9d060c43b21c34668664a504671fd7329 (patch) | |
tree | 9ac1f8d25fca75d23e2a8108cde05e152d698b5c | |
parent | 1bf740434accf20e66383b1ed842bd465ccfb2f5 (diff) | |
download | lvm2-1f164ad9d060c43b21c34668664a504671fd7329.tar.gz lvm2-1f164ad9d060c43b21c34668664a504671fd7329.tar.xz lvm2-1f164ad9d060c43b21c34668664a504671fd7329.zip |
- Ignore suspended devices during repair (Milan).
- Call vgreduce --removemissing (without --force) automatically to clean up bad
PVs (Milan).
-rw-r--r-- | daemons/dmeventd/plugins/mirror/dmeventd_mirror.c | 6 | ||||
-rw-r--r-- | tools/lvconvert.c | 7 | ||||
-rw-r--r-- | tools/vgreduce.c | 5 |
3 files changed, 17 insertions, 1 deletions
diff --git a/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c b/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c index 4c9fcf5c..ab7591d3 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 73aa6b27..b3d4d068 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 014d3379..1428a991 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; |