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: cluster: STABLE3 - rgmanager: Preserve incarnations across config changes
Date: Tue, 11 Aug 2009 19:09:00 -0000	[thread overview]
Message-ID: <20090811190823.96AE41201D6@lists.fedorahosted.org> (raw)

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 */


                 reply	other threads:[~2009-08-11 19:09 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=20090811190823.96AE41201D6@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: link
Be 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).