public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* cluster: STABLE3 - cman: don't delete /totem when re-reading config.
@ 2009-01-14 14:29 Christine Caulfield
  0 siblings, 0 replies; only message in thread
From: Christine Caulfield @ 2009-01-14 14:29 UTC (permalink / raw)
  To: cluster-cvs-relay

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=bbf66e399be7cf1f5f8e3b6b43f34ff8fdb33c7a
Commit:        bbf66e399be7cf1f5f8e3b6b43f34ff8fdb33c7a
Parent:        8e5f8ad50b963842a98ced4be7595f1544a945e6
Author:        Christine Caulfield <ccaulfie@redhat.com>
AuthorDate:    Wed Jan 14 14:26:00 2009 +0000
Committer:     Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Wed Jan 14 14:26:00 2009 +0000

cman: don't delete /totem when re-reading config.

Deleting all of /totem is a *really* bad idea as corosync
stores thing in there that it needs. That will almost certainly
not be overridden by cman-preconfig as it doesn't re-calculate the
cluster IP address on a reload.

Question ... should it ??

Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
 cman/daemon/cman-preconfig.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index 039deea..7bb0ffe 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -1069,13 +1069,8 @@ static int cmanpre_reloadconfig(struct objdb_iface_ver0 *objdb, int flush, char
 	/* copy /cluster/logging to /logging */
 	ret = copy_tree_to_root(objdb, "logging", 0);
 
-	/* destroy top level /totem */
-	objdb->object_find_create(OBJECT_PARENT_HANDLE, "totem", strlen("totem"), &find_handle);
-	ret = objdb->object_find_next(find_handle, &object_handle);
-	objdb->object_find_destroy(find_handle);
-	if (ret) {
-		objdb->object_destroy(object_handle);
-	}
+	/* Note: we do NOT delete /totem as corosync stores other things in there that
+	   it needs! */
 
 	/* copy /cluster/totem to /totem */
 	ret = copy_tree_to_root(objdb, "totem", 0);


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-01-14 14:29 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-01-14 14:29 cluster: STABLE3 - cman: don't delete /totem when re-reading config Christine Caulfield

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).