public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: mornfall@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/daemons/lvmetad lvmetad-core.c Date: Wed, 20 Jul 2011 18:45:00 -0000 [thread overview] Message-ID: <20110720184533.13911.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mornfall@sourceware.org 2011-07-20 18:45:33 Modified files: daemons/lvmetad: lvmetad-core.c Log message: lvmetad: Avoid stale PV -> VG mappings on metadata update. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/lvmetad/lvmetad-core.c.diff?cvsroot=lvm2&r1=1.14&r2=1.15 --- LVM2/daemons/lvmetad/lvmetad-core.c 2011/07/20 18:34:57 1.14 +++ LVM2/daemons/lvmetad/lvmetad-core.c 2011/07/20 18:45:32 1.15 @@ -146,10 +146,9 @@ } } -int update_pvid_map(lvmetad_state *s, struct config_tree *vg) +int update_pvid_map(lvmetad_state *s, struct config_tree *vg, const char *vgid) { struct config_node *pv = pvs(vg); - char *vgid = find_config_str(vg->root, "metadata/id", NULL); if (!vgid) return 0; @@ -163,9 +162,9 @@ return 1; } -static int update_metadata(lvmetad_state *s, const char *vgid, struct config_node *metadata) +static int update_metadata(lvmetad_state *s, const char *_vgid, struct config_node *metadata) { - struct config_tree *old = dm_hash_lookup(s->vgs, vgid); + struct config_tree *old = dm_hash_lookup(s->vgs, _vgid); int seq = find_config_int(metadata, "metadata/seqno", -1); int haveseq = -1; @@ -186,16 +185,23 @@ return 1; } + struct config_tree *cft = create_config_tree(NULL, 0); + cft->root = clone_config_node(cft, metadata, 0); + const char *vgid = find_config_str(cft->root, "metadata/id", NULL); + + if (!vgid) + return 0; + if (haveseq >= 0 && haveseq < seq) { + /* temporarily orphan all of our PVs */ + update_pvid_map(s, old, "#orphan"); /* need to update what we have since we found a newer version */ destroy_config_tree(old); dm_hash_remove(s->vgs, vgid); } - struct config_tree *cft = create_config_tree(NULL, 0); - cft->root = clone_config_node(cft, metadata, 0); dm_hash_insert(s->vgs, vgid, cft); - update_pvid_map(s, cft); + update_pvid_map(s, cft, vgid); return 1; }
next reply other threads:[~2011-07-20 18:45 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-20 18:45 mornfall [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-03-23 10:34 zkabelac 2012-02-27 10:19 zkabelac 2012-02-27 10:10 zkabelac 2012-02-24 0:24 mornfall 2012-02-24 0:12 mornfall 2012-02-21 9:19 mornfall 2012-02-15 17:37 mornfall 2012-02-15 17:30 mornfall 2012-02-15 14:15 mornfall 2012-02-15 14:06 mornfall 2012-02-15 11:43 mornfall 2012-02-13 14:25 zkabelac 2012-01-25 21:42 zkabelac 2011-12-18 22:31 mornfall 2011-09-17 13:33 zkabelac 2011-09-02 11:04 zkabelac 2011-07-25 17:59 mornfall 2011-07-25 15:51 mornfall 2011-07-25 15:33 mornfall 2011-07-20 21:33 mornfall 2011-07-20 21:27 mornfall 2011-07-20 21:26 mornfall 2011-07-20 21:23 mornfall 2011-07-20 18:34 mornfall 2011-07-20 18:24 mornfall 2011-07-20 16:49 mornfall 2011-07-20 16:46 mornfall 2011-07-20 15:14 mornfall 2011-07-19 19:15 mornfall 2011-07-19 14:14 mornfall
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=20110720184533.13911.qmail@sourceware.org \ --to=mornfall@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).