* [Cluster-devel] cluster/cman/daemon cmanccs.c commands.c
@ 2007-05-18 10:13 pcaulfield
0 siblings, 0 replies; 2+ messages in thread
From: pcaulfield @ 2007-05-18 10:13 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: pcaulfield at sourceware.org 2007-05-18 10:13:35
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&r1=1.26&r2=1.27
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/commands.c.diff?cvsroot=cluster&r1=1.61&r2=1.62
--- cluster/cman/daemon/cmanccs.c 2007/03/15 11:12:33 1.26
+++ cluster/cman/daemon/cmanccs.c 2007/05/18 10:13:35 1.27
@@ -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:49 1.61
+++ cluster/cman/daemon/commands.c 2007/05/18 10:13:35 1.62
@@ -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;
^ permalink raw reply [flat|nested] 2+ messages in thread* [Cluster-devel] cluster/cman/daemon cmanccs.c commands.c
@ 2007-05-18 12:46 pcaulfield
0 siblings, 0 replies; 2+ messages in thread
From: pcaulfield @ 2007-05-18 12:46 UTC (permalink / raw)
To: cluster-devel.redhat.com
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;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-05-18 12:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-18 10:13 [Cluster-devel] cluster/cman/daemon cmanccs.c commands.c pcaulfield
-- strict thread matches above, loose matches on Subject: below --
2007-05-18 12:46 pcaulfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.