[Cluster-devel] cluster/cman/daemon cmanccs.c commands.c
pcaulfield at sourceware.org
pcaulfield at sourceware.org
Fri May 18 12:46:32 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: pcaulfield at sourceware.org 2007-05-18 12:46:30
Modified files:
cman/daemon : cmanccs.c commands.c
Log message:
Allow ccs to change the two_node flag.
bz#240508
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/cmanccs.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.2&r2=1.21.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.55.2.6&r2=1.55.2.7
--- cluster/cman/daemon/cmanccs.c 2007/01/02 15:17:36 1.21.2.2
+++ cluster/cman/daemon/cmanccs.c 2007/05/18 12:46:30 1.21.2.3
@@ -61,7 +61,7 @@
static int portnums[MAX_NODENAMES];
static char *mcast[MAX_NODENAMES];
static int num_nodenames;
-static int two_node;
+ int two_node;
char *key_filename;
static char *mcast_name;
static unsigned char votes;
@@ -123,6 +123,8 @@
two_node = atoi(str);
free(str);
}
+ else
+ two_node = 0;
for (i=1;;i++) {
char nodekey[256];
--- cluster/cman/daemon/commands.c 2007/01/17 15:02:13 1.55.2.6
+++ cluster/cman/daemon/commands.c 2007/05/18 12:46:30 1.55.2.7
@@ -61,7 +61,7 @@
unsigned int config_version;
static struct cluster_node *us;
static int quorum;
-static int two_node;
+extern int two_node;
unsigned int quorumdev_poll=10000;
unsigned int shutdown_timeout=5000;
unsigned int ccsd_poll_interval=1000;
More information about the Cluster-devel
mailing list