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 16:46:00 -0000 [thread overview] Message-ID: <20110720164641.405.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mornfall@sourceware.org 2011-07-20 16:46:40 Modified files: daemons/lvmetad: lvmetad-core.c Log message: Make lvmetad also report VGID in reply when adding a PV without MDAs (this obviously only works for VGs that already had at least some MDA discovered). Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/lvmetad/lvmetad-core.c.diff?cvsroot=lvm2&r1=1.10&r2=1.11 --- LVM2/daemons/lvmetad/lvmetad-core.c 2011/07/20 15:14:17 1.10 +++ LVM2/daemons/lvmetad/lvmetad-core.c 2011/07/20 16:46:40 1.11 @@ -83,12 +83,17 @@ } } -static void update_pv_status_in_vg(lvmetad_state *s, struct config_tree *vg) +struct config_node *pvs(struct config_tree *vg) { struct config_node *pv = find_config_node(vg->root, "metadata/physical_volumes"); if (pv) pv = pv->child; + return pv; +} +static void update_pv_status_in_vg(lvmetad_state *s, struct config_tree *vg) +{ + struct config_node *pv = pvs(vg); while (pv) { const char *uuid = find_config_str(pv->child, "id", "N/A"); const char *vgid = find_config_str(vg->root, "metadata/id", "N/A"); @@ -101,9 +106,7 @@ static int vg_status(lvmetad_state *s, const char *vgid) { struct config_tree *vg = dm_hash_lookup(s->vgs, vgid); - struct config_node *pv = find_config_node(vg->root, "metadata/physical_volumes"); - if (pv) - pv = pv->child; + struct config_node *pv = pvs(vg); while (pv) { const char *uuid = find_config_str(pv->child, "id", "N/A"); @@ -141,6 +144,26 @@ } } +struct config_tree *vg_from_pvid(lvmetad_state *s, const char *pvid) +{ + struct dm_hash_node *n = dm_hash_get_first(s->vgs); + + while (n) { + struct config_tree *vg = dm_hash_get_data(s->vgs, n); + struct config_node *pv = pvs(vg); + + while (pv) { + const char *uuid = find_config_str(pv->child, "id", "N/A"); + if (!strcmp(uuid, pvid)) + return vg; + pv = pv->sib; + } + + n = dm_hash_get_next(s->vgs, n); + } + return NULL; +} + static int update_metadata(lvmetad_state *s, const char *vgid, struct config_node *metadata) { struct config_tree *old = dm_hash_lookup(s->vgs, vgid); @@ -198,8 +221,9 @@ return daemon_reply_simple("failed", "reason = %s", "metadata update failed", NULL); } else { - // TODO: find the corresponding VGID when available to give to - // the caller, and to find out whether the VG is complete + struct config_tree *vg = vg_from_pvid(s, pvid); + if (vg) + vgid = find_config_str(vg->root, "metadata/id", NULL); } update_pv_status(s, NULL); @@ -207,7 +231,7 @@ return daemon_reply_simple("OK", "status = %s", complete ? "complete" : "partial", - vgid ? "vgid = %s" : "", vgid, + "vgid = %s", vgid ? vgid : "#orphan", NULL); }
next reply other threads:[~2011-07-20 16:46 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-20 16:46 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:45 mornfall 2011-07-20 18:34 mornfall 2011-07-20 18:24 mornfall 2011-07-20 16:49 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=20110720164641.405.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).