From 93873dac8ab08f63700d76abe61d70693548323e Mon Sep 17 00:00:00 2001
From: Lon Hohberger <lhh@redhat.com>
Date: Fri, 31 Jul 2009 15:41:58 -0400
Subject: [PATCH] rgmanager: Preserve incarnations across config changes

Resolves: rhbz506094

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 94fa303..377d2ed 100644
--- a/rgmanager/src/daemons/groups.c
+++ b/rgmanager/src/daemons/groups.c
@@ -1618,6 +1618,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
@@ -1744,6 +1769,8 @@ init_resource_groups(int reconfigure, int do_init, int new_config_version)
 		pthread_rwlock_unlock(&resource_lock);
 
 		do_condstops();
+
+		copy_incarnations(&_resources, &reslist);
 	}
 
 	/* Swap in the new configuration */
-- 
1.6.2.5