From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17996 invoked by alias); 11 Aug 2009 19:29:02 -0000 Received: (qmail 17988 invoked by alias); 11 Aug 2009 19:29:02 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: rgmanager: master - rgmanager: Preserve incarnations across config changes To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: rgmanager.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 202c45ed9d52bb5e3e13920b548790fe02c5c044 X-Git-Newrev: 7310545c230d441b9aa413d1ebd320cf01a3bc4d From: Lon Hohberger Message-Id: <20090811192838.80E931201D6@lists.fedorahosted.org> Date: Tue, 11 Aug 2009 19:29:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00186.txt.bz2 Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=7310545c230d441b9aa413d1ebd320cf01a3bc4d Commit: 7310545c230d441b9aa413d1ebd320cf01a3bc4d Parent: 202c45ed9d52bb5e3e13920b548790fe02c5c044 Author: Lon Hohberger AuthorDate: Fri Jul 31 15:41:58 2009 -0400 Committer: Lon Hohberger 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 --- 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 */