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: Mon, 25 Jul 2011 15:51:00 -0000 [thread overview] Message-ID: <20110725155152.1143.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mornfall@sourceware.org 2011-07-25 15:51:51 Modified files: daemons/lvmetad: lvmetad-core.c Log message: lvmetad: Check integrity of multiple metadata copies, i.e. ensure that seqno equality implies metadata equality. Signal error in response to any update requests that try to overwrite metadata without providing a higher seqno. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/lvmetad/lvmetad-core.c.diff?cvsroot=lvm2&r1=1.20&r2=1.21 --- LVM2/daemons/lvmetad/lvmetad-core.c 2011/07/25 15:33:04 1.20 +++ LVM2/daemons/lvmetad/lvmetad-core.c 2011/07/25 15:51:51 1.21 @@ -96,6 +96,54 @@ } /* + * TODO: Accept different flag permutations? Or else, ensure fixed ordering of + * flags in set_flag below (following the same order as we have in + * lib/format_text/flags.c). + */ +static int compare_value(struct config_value *a, struct config_value *b) +{ + if (a->type > b->type) + return 1; + if (a->type < b->type) + return -1; + + switch (a->type) { + case CFG_STRING: return strcmp(a->v.str, b->v.str); + case CFG_FLOAT: return a->v.r == b->v.r; + case CFG_INT: return a->v.i == b->v.i; + case CFG_EMPTY_ARRAY: return 0; + } + + if (a->next && b->next) + return compare_value(a->next, b->next); +} + +static int compare_config(struct config_node *a, struct config_node *b) +{ + int result = 0; + if (a->v && b->v) + result = compare_value(a->v, b->v); + if (a->v && !b->v) + result = 1; + if (!a->v && b->v) + result = -1; + if (a->child && b->child) + result = compare_config(a->child, b->child); + + if (result) + return result; + + if (a->sib && b->sib) + result = compare_config(a->sib, b->sib); + if (a->sib && !b->sib) + result = 1; + if (!a->sib && b->sib) + result = -1; + + return result; +} + +/* * TODO: This set_flag function is pretty generic and might make sense in a * library here or there. */ @@ -212,8 +260,10 @@ goto out; if (seq == haveseq) { - // TODO: compare old->root with metadata to ensure equality retval = 1; + // TODO: disregard the MISSING_PV flag status in this comparison + if (compare_config(metadata, old->root)) + retval = 0; goto out; }
next reply other threads:[~2011-07-25 15:51 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-07-25 15:51 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: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 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=20110725155152.1143.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).