From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13938 invoked by alias); 20 Jul 2011 18:45:33 -0000 Received: (qmail 13913 invoked by uid 9699); 20 Jul 2011 18:45:33 -0000 Date: Wed, 20 Jul 2011 18:45:00 -0000 Message-ID: <20110720184533.13911.qmail@sourceware.org> From: mornfall@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/daemons/lvmetad lvmetad-core.c Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2011-07/txt/msg00051.txt.bz2 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; }