This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
Cluster Project branch, master, updated. gfs-kernel_0_1_22-100-gb593d15
- From: fabbione at sourceware dot org
- To: cluster-cvs at sources dot redhat dot com, cluster-devel at redhat dot com
- Date: 27 Mar 2008 06:42:07 -0000
- Subject: Cluster Project branch, master, updated. gfs-kernel_0_1_22-100-gb593d15
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=b593d15ea42423440da2e6fdaf2bb9754d03632b
The branch, master has been updated
via b593d15ea42423440da2e6fdaf2bb9754d03632b (commit)
from b08be99c3a37ff4aeeb309d0c03ecce9f04904ab (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b593d15ea42423440da2e6fdaf2bb9754d03632b
Author: Fabio M. Di Nitto <fabbione@fabbione.net>
Date: Thu Mar 27 07:39:46 2008 +0100
[CMAN] Fix config handling
Some objects were not relocated properly and it was breaking
logging among other bits.
Signed-off-by: Fabio M. Di Nitto <fabbione@fabbione.net>
-----------------------------------------------------------------------
Summary of changes:
cman/daemon/ais.c | 6 +++++-
cman/daemon/cman-preconfig.c | 12 ++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/cman/daemon/ais.c b/cman/daemon/ais.c
index f23ca06..e11131b 100644
--- a/cman/daemon/ais.c
+++ b/cman/daemon/ais.c
@@ -64,6 +64,7 @@ int num_interfaces;
uint64_t incarnation;
int num_ais_nodes;
extern unsigned int config_version;
+static unsigned int cluster_parent_handle;
static int startup_pipe;
static unsigned int debug_mask;
@@ -177,7 +178,10 @@ static int cman_exec_init_fn(struct objdb_iface_ver0 *objdb)
/* Get our config variables */
objdb->object_find_reset(OBJECT_PARENT_HANDLE);
- if (objdb->object_find(OBJECT_PARENT_HANDLE, "cman", strlen("cman"), &object_handle) == 0)
+ objdb->object_find(OBJECT_PARENT_HANDLE,
+ "cluster", strlen("cluster"), &cluster_parent_handle);
+
+ if (objdb->object_find(cluster_parent_handle, "cman", strlen("cman"), &object_handle) == 0)
{
objdb_get_int(objdb, object_handle, "quorum_dev_poll", &quorumdev_poll);
objdb_get_int(objdb, object_handle, "shutdown_timeout", &shutdown_timeout);
diff --git a/cman/daemon/cman-preconfig.c b/cman/daemon/cman-preconfig.c
index c45cc0e..b3dc805 100644
--- a/cman/daemon/cman-preconfig.c
+++ b/cman/daemon/cman-preconfig.c
@@ -616,15 +616,15 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
}
/* Make sure mainconfig doesn't stomp on our logging options */
- if (objdb->object_find(cluster_parent_handle,
+ if (objdb->object_find(OBJECT_PARENT_HANDLE,
"logging", strlen("logging"), &object_handle)) {
- objdb->object_create(cluster_parent_handle, &object_handle,
+ objdb->object_create(OBJECT_PARENT_HANDLE, &object_handle,
"logging", strlen("logging"));
}
- objdb->object_find_reset(cluster_parent_handle);
- if (objdb->object_find(cluster_parent_handle,
+ objdb->object_find_reset(OBJECT_PARENT_HANDLE);
+ if (objdb->object_find(OBJECT_PARENT_HANDLE,
"logging", strlen("logging"),
&object_handle) == 0) {
unsigned int logger_object_handle;
@@ -650,8 +650,8 @@ static void add_cman_overrides(struct objdb_iface_ver0 *objdb)
}
/* Don't run under user "ais" */
- objdb->object_find_reset(cluster_parent_handle);
- if (objdb->object_find(cluster_parent_handle, "aisexec", strlen("aisexec"), &object_handle) == 0)
+ objdb->object_find_reset(OBJECT_PARENT_HANDLE);
+ if (objdb->object_find(OBJECT_PARENT_HANDLE, "aisexec", strlen("aisexec"), &object_handle) == 0)
{
objdb->object_key_create(object_handle, "user", strlen("user"),
"root", strlen("root") + 1);
hooks/post-receive
--
Cluster Project