cluster: STABLE3 - rgmanager: Preserve incarnations across config changes
Lon Hohberger
lon@fedoraproject.org
Tue Aug 11 19:09:00 GMT 2009
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=db508706c7f433041823b21a4ce50df9e0edfd51
Commit: db508706c7f433041823b21a4ce50df9e0edfd51
Parent: 20b5f3ac3ca80b7010e55edf0cedb36b74fbfdb7
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:07:24 2009 -0400
rgmanager: Preserve incarnations across config changes
Red Hat Bugzilla #506094, part 2/3
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 1d58041..34aa188 100644
--- a/rgmanager/src/daemons/groups.c
+++ b/rgmanager/src/daemons/groups.c
@@ -1573,6 +1573,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
@@ -1688,6 +1713,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 */
More information about the Cluster-cvs
mailing list