cluster: STABLE3 - cman config: copy all logging objects to the top level tree

Fabio M. Di Nitto fabbione at fedoraproject.org
Fri Jul 16 09:38:27 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=517771b27fc41a95a20df5f80f0fc45ed1743911
Commit:        517771b27fc41a95a20df5f80f0fc45ed1743911
Parent:        254d40f98fc333b4bee96862ff7ce2b36dcb2a1c
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Fri Jul 16 11:36:37 2010 +0200
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Fri Jul 16 11:36:37 2010 +0200

cman config: copy all logging objects to the top level tree

Resolves: rhbz#615202

NOTE: this fix also recommends the proposed patch for rhbz#615203
or in certain configuration cases, corosync will refuse to start.
Workaround, disable custom logging_daemon options in cluster.conf.

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 cman/daemon/cman-preconfig.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index ef5964f..f741a8a 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -1066,7 +1066,7 @@ static int copy_config_tree(struct objdb_iface_ver0 *objdb, hdb_handle_t source_
 	while ( (res = objdb->object_find_next(find_handle, &object_handle) == 0)) {
 
 		/* Down we go ... */
-		copy_config_tree(objdb, object_handle, new_object, 0);
+		copy_config_tree(objdb, object_handle, new_object, always_create);
 	}
 	objdb->object_find_destroy(find_handle);
 
@@ -1174,7 +1174,7 @@ static int cmanpre_reloadconfig(struct objdb_iface_ver0 *objdb, int flush, const
 	}
 
 	/* copy /cluster/logging to /logging */
-	ret = copy_tree_to_root(objdb, "logging", 0);
+	ret = copy_tree_to_root(objdb, "logging", 1);
 
 	/* Note: we do NOT delete /totem as corosync stores other things in there that
 	   it needs! */
@@ -1296,7 +1296,7 @@ static int cmanpre_readconfig(struct objdb_iface_ver0 *objdb, const char **error
 	else {
 		/* Move these to a place where corosync expects to find them */
 		ret = copy_tree_to_root(objdb, "totem", 0);
-		ret = copy_tree_to_root(objdb, "logging", 0);
+		ret = copy_tree_to_root(objdb, "logging", 1);
 		ret = copy_tree_to_root(objdb, "event", 0);
 		ret = copy_tree_to_root(objdb, "amf", 0);
 		ret = copy_tree_to_root(objdb, "aisexec", 0);


More information about the cluster-commits mailing list