public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: jbrassow@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW lib/metadata/mirror.c Date: Tue, 13 Jul 2010 21:48:00 -0000 [thread overview] Message-ID: <20100713214818.17286.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: jbrassow@sourceware.org 2010-07-13 21:48:17 Modified files: . : WHATS_NEW lib/metadata : mirror.c Log message: Fix for bugs: 612248 & 612291 Split mirror issues The main problem with these bugs was that the newly split off LV was not being suspended properly. This meant that the memlock count was not being balanced, the DM devices were not being renamed, and some DM devices which should have been removed were not. I've also renamed some of the variables and added comments to make things clearer as to what is going on. (I can break this patch in two if it means easier review.) Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1666&r2=1.1667 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/mirror.c.diff?cvsroot=lvm2&r1=1.125&r2=1.126 --- LVM2/WHATS_NEW 2010/07/13 13:51:01 1.1666 +++ LVM2/WHATS_NEW 2010/07/13 21:48:16 1.1667 @@ -1,5 +1,6 @@ Version 2.02.71 - =============================== + Fix suspend/resume logic for LVs resulting from splitting a mirror. Switch cmirrord and clvmd to use dm_create_lockfile. Allow clvmd pidfile to be configurable. Update comments about memory handling in lvm2app.h. --- LVM2/lib/metadata/mirror.c 2010/07/09 17:57:51 1.125 +++ LVM2/lib/metadata/mirror.c 2010/07/13 21:48:17 1.126 @@ -553,9 +553,9 @@ struct dm_list *removable_pvs) { uint32_t i; - struct logical_volume *sub_lv, *new_lv = NULL; + struct logical_volume *sub_lv = NULL; + struct logical_volume *new_lv = NULL; struct logical_volume *detached_log_lv = NULL; - struct logical_volume *lv1 = NULL; struct lv_segment *mirrored_seg = first_seg(lv); struct dm_list split_images; struct lv_list *lvl; @@ -597,6 +597,8 @@ release_lv_segment_area(mirrored_seg, mirrored_seg->area_count, mirrored_seg->area_len); + log_very_verbose("%s assigned to be split", sub_lv->name); + if (!new_lv) { new_lv = sub_lv; new_lv->name = dm_pool_strdup(lv->vg->cmd->mem, @@ -662,13 +664,19 @@ init_mirror_in_sync(1); } - /* If no more mirrors, remove mirror layer */ + sub_lv = NULL; + + /* + * If no more mirrors, remove mirror layer. + * The sub_lv is removed entirely later - leaving + * only the top-level (now linear) LV. + */ if (mirrored_seg->area_count == 1) { - lv1 = seg_lv(mirrored_seg, 0); - lv1->status &= ~MIRROR_IMAGE; - lv_set_visible(lv1); + sub_lv = seg_lv(mirrored_seg, 0); + sub_lv->status &= ~MIRROR_IMAGE; + lv_set_visible(sub_lv); detached_log_lv = detach_mirror_log(mirrored_seg); - if (!remove_layer_from_lv(lv, lv1)) + if (!remove_layer_from_lv(lv, sub_lv)) return_0; lv->status &= ~MIRRORED; lv->status &= ~MIRROR_NOTSYNCED; @@ -679,6 +687,9 @@ return 0; } + /* + * Suspend the original device and all its sub devices + */ if (!suspend_lv(mirrored_seg->lv->vg->cmd, mirrored_seg->lv)) { log_error("Failed to lock %s", mirrored_seg->lv->name); vg_revert(mirrored_seg->lv->vg); @@ -690,35 +701,32 @@ return 0; } - log_very_verbose("Updating \"%s\" in kernel", mirrored_seg->lv->name); - /* - * If we have split off a mirror instead of linear (i.e. the - * split_images list is not empty), then we must perform a - * resume to get the mirror started. + * Suspend the newly split-off LV (balance memlock count + * and prepare for DM automated renaming via resume). */ - if (!dm_list_empty(&split_images) && !resume_lv(lv->vg->cmd, new_lv)) { - log_error("Failed to resume newly split LV, %s", new_lv->name); + if (!suspend_lv(lv->vg->cmd, new_lv)) { + log_error("Failed to lock newly split LV, %s", new_lv->name); + vg_revert(lv->vg); return 0; } - /* - * Avoid having same mirror target loaded twice simultaneously by first - * resuming the removed LV which now contains an error segment. - * As it's now detached from mirrored_seg->lv we must resume it - * explicitly. - */ - if (lv1 && !resume_lv(lv1->vg->cmd, lv1)) { - log_error("Problem resuming temporary LV, %s", lv1->name); + /* Bring newly split-off LV into existence */ + log_very_verbose("Creating %s", new_lv->name); + if (!resume_lv(lv->vg->cmd, new_lv)) { + log_error("Failed to activate newly split LV, %s", + new_lv->name); return 0; } + /* Resume altered original LV */ + log_very_verbose("Updating \"%s\" in kernel", mirrored_seg->lv->name); if (!resume_lv(mirrored_seg->lv->vg->cmd, mirrored_seg->lv)) { log_error("Problem reactivating %s", mirrored_seg->lv->name); return 0; } - if (lv1 && !_delete_lv(lv, lv1)) + if (sub_lv && !_delete_lv(lv, sub_lv)) return_0; if (detached_log_lv && !_delete_lv(lv, detached_log_lv))
next reply other threads:[~2010-07-13 21:48 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-07-13 21:48 jbrassow [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-03-23 16:28 mbroz 2012-02-01 13:50 zkabelac 2011-10-25 13:17 jbrassow 2011-10-06 14:49 jbrassow 2011-09-14 2:45 jbrassow 2011-09-13 21:13 jbrassow 2011-09-13 14:37 jbrassow 2011-09-13 13:59 jbrassow 2011-09-01 19:22 jbrassow 2011-06-17 14:27 zkabelac 2010-08-16 18:02 jbrassow 2010-07-13 22:24 jbrassow 2010-07-09 15:08 jbrassow 2010-06-28 14:19 jbrassow 2010-06-21 16:12 jbrassow 2010-04-27 15:27 jbrassow 2010-04-27 14:57 jbrassow 2009-12-09 19:53 mbroz 2009-12-09 18:09 mbroz 2009-04-10 9:53 mbroz 2008-10-17 10:50 agk 2008-09-18 19:09 agk 2008-06-13 12:15 meyering 2008-02-22 13:28 agk 2007-11-22 13:57 agk 2006-11-30 17:52 agk 2006-11-10 19:35 agk 2006-07-20 20:37 agk
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20100713214818.17286.qmail@sourceware.org \ --to=jbrassow@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).