public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Lon Hohberger <lon@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: rgmanager: master - rgmanager: Preserve incarnations across config changes Date: Tue, 11 Aug 2009 19:29:00 -0000 [thread overview] Message-ID: <20090811192838.80E931201D6@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=7310545c230d441b9aa413d1ebd320cf01a3bc4d Commit: 7310545c230d441b9aa413d1ebd320cf01a3bc4d Parent: 202c45ed9d52bb5e3e13920b548790fe02c5c044 Author: Lon Hohberger <lhh@redhat.com> AuthorDate: Fri Jul 31 15:41:58 2009 -0400 Committer: Lon Hohberger <lhh@redhat.com> CommitterDate: Tue Aug 11 15:27:45 2009 -0400 rgmanager: Preserve incarnations across config changes Red Hat Bugzilla #506094, part 2/3 (Part 1/3 is in the resource-agents repository) Signed-off-by: Lon Hohberger <lhh@redhat.com> --- rgmanager/src/daemons/groups.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/rgmanager/src/daemons/groups.c b/rgmanager/src/daemons/groups.c index 573a973..ce55ff3 100644 --- a/rgmanager/src/daemons/groups.c +++ b/rgmanager/src/daemons/groups.c @@ -1575,6 +1575,31 @@ dump_config_version(FILE *fp) /** + Copy out the incarnations after doing CONDSTOPs + */ +static int +copy_incarnations(resource_t **leftres, resource_t **rightres) +{ + resource_t *lc, *rc; + int ret; + + list_do(leftres, lc) { + rc = find_resource_by_ref(rightres, lc->r_rule->rr_type, + primary_attr_value(lc)); + /* Resource does not exist */ + if (!rc) + continue; + + /* Ok, see if the resource is the same */ + if (!rescmp(lc, rc)) + rc->r_incarnations = lc->r_incarnations; + } while (!list_done(leftres, lc)); + + return 0; +} + + +/** Initialize resource groups. This reads all the resource groups from CCS, builds the tree, etc. Ideally, we'll have a similar function performing deltas on the two trees so that we can fully support online @@ -1690,6 +1715,8 @@ init_resource_groups(int reconfigure, int do_init) pthread_rwlock_unlock(&resource_lock); do_condstops(); + + copy_incarnations(&_resources, &reslist); } /* Swap in the new configuration */
reply other threads:[~2009-08-11 19:29 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20090811192838.80E931201D6@lists.fedorahosted.org \ --to=lon@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /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).