[Cluster-devel] cluster/cman/daemon ais.c

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2006-07-19 08:33:13

Modified files:
	cman/daemon    : ais.c 

Log message:
	for RRP use "active" rather than "passive" on Steve's advice.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.31&r2=1.32

--- cluster/cman/daemon/ais.c	2006/06/30 13:00:26	1.31
+++ cluster/cman/daemon/ais.c	2006/07/19 08:33:12	1.32
@@ -422,7 +422,7 @@
 		/* Set RRP mode appropriately */
 		if (num_interfaces > 1) {
 			global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),
-							"passive", strlen("passive")+1);
+							"active", strlen("active")+1);
 		}
 		else {
 			global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2006-08-09 09:46:30

Modified files:
	cman/daemon    : ais.c 

Log message:
	Some systems need #include <signal.h> and who are we to deny them ?

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.34&r2=1.35

--- cluster/cman/daemon/ais.c	2006/08/02 11:54:36	1.34
+++ cluster/cman/daemon/ais.c	2006/08/09 09:46:30	1.35
@@ -19,6 +19,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <syslog.h>
+#include <signal.h>
 #include <sys/socket.h>
 #include <sys/utsname.h>
 #include <netinet/in.h>

[Cluster-devel] cluster/cman/daemon ais.c

[rpeterso]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	rpeterso at sourceware.org	2006-08-10 19:45:54

Modified files:
	cman/daemon    : ais.c 

Log message:
	Fix minor compile problem due to missing include.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.35&r2=1.36

--- cluster/cman/daemon/ais.c	2006/08/09 09:46:30	1.35
+++ cluster/cman/daemon/ais.c	2006/08/10 19:45:54	1.36
@@ -25,6 +25,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <signal.h>
 
 /* openais headers */
 #include <openais/totem/totemip.h>

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2006-08-11 07:09:14

Modified files:
	cman/daemon    : ais.c 

Log message:
	We don't really need to include signal.h twice :)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.36&r2=1.37

--- cluster/cman/daemon/ais.c	2006/08/10 19:45:54	1.36
+++ cluster/cman/daemon/ais.c	2006/08/11 07:09:13	1.37
@@ -25,7 +25,6 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include <signal.h>
 
 /* openais headers */
 #include <openais/totem/totemip.h>

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2006-09-25 11:38:53

Modified files:
	cman/daemon    : ais.c 

Log message:
	Add struct entry for .flow_control to keep latest openais happy.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.39&r2=1.40

--- cluster/cman/daemon/ais.c	2006/08/17 13:22:39	1.39
+++ cluster/cman/daemon/ais.c	2006/09/25 11:38:53	1.40
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <unistd.h>
 #include <string.h>
 #include <syslog.h>
 #include <signal.h>
@@ -134,6 +135,7 @@
 static struct openais_service_handler cman_service_handler = {
 	.name		    		= (unsigned char *)"openais CMAN membership service 2.01",
 	.id			        = CMAN_SERVICE,
+	.flow_control			= OPENAIS_FLOW_CONTROL_NOT_REQUIRED,
 	.lib_exit_fn		       	= cman_exit_fn,
 	.exec_init_fn		       	= cman_exec_init_fn,
 	.config_init_fn                 = NULL,

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2006-10-31 09:28:13

Modified files:
	cman/daemon    : ais.c 

Log message:
	Set the default token timeout to 5 seconds. It can still be overridden
	in cluster.conf if required.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.42&r2=1.43

--- cluster/cman/daemon/ais.c	2006/10/05 07:48:33	1.42
+++ cluster/cman/daemon/ais.c	2006/10/31 09:28:12	1.43
@@ -470,6 +470,8 @@
 			       "totem", strlen("totem"),
 			       &object_handle) == 0)
 	{
+		void *value = NULL;
+
 		objdb->object_key_create(object_handle, "version", strlen("version"),
 					 "2", 2);
 
@@ -480,6 +482,13 @@
 		objdb->object_key_create(object_handle, "vsftype", strlen("vsftype"),
 					 "none", strlen("none")+1);
 
+		/* Set the token timeout is 5 seconds, but don't overrride anything that
+		   might be in cluster.conf */
+		if (objdb->object_key_get(object_handle, "token", strlen("token"), &value, NULL) || value == NULL) {
+			global_objdb->object_key_create(object_handle, "token", strlen("token"),
+							"5000", strlen("5000")+1);
+		}
+
 		/* Set RRP mode appropriately */
 		if (num_interfaces > 1) {
 			global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2006-10-31 17:27:45

Modified files:
	cman/daemon    : ais.c 

Log message:
	On Steven Dake's recommendation, also up the token_retransmit count to 20.
	and fix a couple of typos.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.43&r2=1.44

--- cluster/cman/daemon/ais.c	2006/10/31 09:28:12	1.43
+++ cluster/cman/daemon/ais.c	2006/10/31 17:27:45	1.44
@@ -470,7 +470,7 @@
 			       "totem", strlen("totem"),
 			       &object_handle) == 0)
 	{
-		void *value = NULL;
+		char *value;
 
 		objdb->object_key_create(object_handle, "version", strlen("version"),
 					 "2", 2);
@@ -482,12 +482,17 @@
 		objdb->object_key_create(object_handle, "vsftype", strlen("vsftype"),
 					 "none", strlen("none")+1);
 
-		/* Set the token timeout is 5 seconds, but don't overrride anything that
+		/* Set the token timeout is 5 seconds - 20 losses, but don't overrride anything that
 		   might be in cluster.conf */
-		if (objdb->object_key_get(object_handle, "token", strlen("token"), &value, NULL) || value == NULL) {
+		if (objdb_get_string(objdb, object_handle, "token", &value)) {
 			global_objdb->object_key_create(object_handle, "token", strlen("token"),
 							"5000", strlen("5000")+1);
 		}
+		if (objdb_get_string(objdb, object_handle, "token_retransmits_before_loss_const", &value)) {
+			global_objdb->object_key_create(object_handle, "token_retransmits_before_loss_const",
+							strlen("token_retransmits_before_loss_const"),
+							"20", strlen("20")+1);
+		}
 
 		/* Set RRP mode appropriately */
 		if (num_interfaces > 1) {
@@ -509,7 +514,7 @@
 						 key_filename, strlen(key_filename)+1);
 		}
 		else /* Use the cluster name as key,
-		      * This isn't a good isolation strategey but it does make sure that
+		      * This isn't a good isolation strategy but it does make sure that
 		      * clusters on the same port/multicast by mistake don't actually interfere
 		      * and that we have some form of encryption going.
 		      */
@@ -536,7 +541,7 @@
 		char *logstr;
 
 		/* Default logging facility is "local4" unless overridden by the user */
-		if (!objdb_get_string(objdb, object_handle, "syslog_facility", &logstr)) {
+		if (objdb_get_string(objdb, object_handle, "syslog_facility", &logstr)) {
 			objdb->object_key_create(object_handle, "syslog_facility", strlen("syslog_facility"),
 						 "local4", strlen("local4")+1);
 		}

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2006-11-09 13:10:42

Modified files:
	cman/daemon    : ais.c 

Log message:
	Set join_timeout and consensus_timeout to higher defaults as per
	bz#214920

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.44&r2=1.45

--- cluster/cman/daemon/ais.c	2006/10/31 17:27:45	1.44
+++ cluster/cman/daemon/ais.c	2006/11/09 13:10:42	1.45
@@ -494,6 +494,17 @@
 							"20", strlen("20")+1);
 		}
 
+		/* Extend consensus & join timeouts per bz#214290 */
+		if (objdb_get_string(objdb, object_handle, "join", &value)) {
+			global_objdb->object_key_create(object_handle, "join", strlen("join"),
+							"60", strlen("60")+1);
+		}
+		if (objdb_get_string(objdb, object_handle, "consensus", &value)) {
+			global_objdb->object_key_create(object_handle, "consensus", strlen("consensus"),
+							"4800", strlen("4800")+1);
+		}
+
+
 		/* Set RRP mode appropriately */
 		if (num_interfaces > 1) {
 			global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL50
Changes by:	pcaulfield at sourceware.org	2006-11-09 13:50:42

Modified files:
	cman/daemon    : ais.c 

Log message:
	Set join_timeout and consensus_timeout to higher defaults as per
	bz#214920

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&only_with_tag=RHEL50&r1=1.44&r2=1.44.4.1

--- cluster/cman/daemon/ais.c	2006/10/31 17:27:45	1.44
+++ cluster/cman/daemon/ais.c	2006/11/09 13:50:42	1.44.4.1
@@ -494,6 +494,17 @@
 							"20", strlen("20")+1);
 		}
 
+		/* Extend consensus & join timeouts per bz#214290 */
+		if (objdb_get_string(objdb, object_handle, "join", &value)) {
+			global_objdb->object_key_create(object_handle, "join", strlen("join"),
+							"60", strlen("60")+1);
+		}
+		if (objdb_get_string(objdb, object_handle, "consensus", &value)) {
+			global_objdb->object_key_create(object_handle, "consensus", strlen("consensus"),
+							"4800", strlen("4800")+1);
+		}
+
+
 		/* Set RRP mode appropriately */
 		if (num_interfaces > 1) {
 			global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	pcaulfield at sourceware.org	2006-11-09 13:51:15

Modified files:
	cman/daemon    : ais.c 

Log message:
	Set join_timeout and consensus_timeout to higher defaults as per
	bz#214920

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.44&r2=1.44.2.1

--- cluster/cman/daemon/ais.c	2006/10/31 17:27:45	1.44
+++ cluster/cman/daemon/ais.c	2006/11/09 13:51:15	1.44.2.1
@@ -494,6 +494,17 @@
 							"20", strlen("20")+1);
 		}
 
+		/* Extend consensus & join timeouts per bz#214290 */
+		if (objdb_get_string(objdb, object_handle, "join", &value)) {
+			global_objdb->object_key_create(object_handle, "join", strlen("join"),
+							"60", strlen("60")+1);
+		}
+		if (objdb_get_string(objdb, object_handle, "consensus", &value)) {
+			global_objdb->object_key_create(object_handle, "consensus", strlen("consensus"),
+							"4800", strlen("4800")+1);
+		}
+
+
 		/* Set RRP mode appropriately */
 		if (num_interfaces > 1) {
 			global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2006-12-18 09:37:45

Modified files:
	cman/daemon    : ais.c 

Log message:
	Increase token timeout to 10s as per bz#216954

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.45&r2=1.46

--- cluster/cman/daemon/ais.c	2006/11/09 13:10:42	1.45
+++ cluster/cman/daemon/ais.c	2006/12/18 09:37:45	1.46
@@ -482,11 +482,11 @@
 		objdb->object_key_create(object_handle, "vsftype", strlen("vsftype"),
 					 "none", strlen("none")+1);
 
-		/* Set the token timeout is 5 seconds - 20 losses, but don't overrride anything that
+		/* Set the token timeout is 10 seconds, but don't overrride anything that
 		   might be in cluster.conf */
 		if (objdb_get_string(objdb, object_handle, "token", &value)) {
 			global_objdb->object_key_create(object_handle, "token", strlen("token"),
-							"5000", strlen("5000")+1);
+							"10000", strlen("10000")+1);
 		}
 		if (objdb_get_string(objdb, object_handle, "token_retransmits_before_loss_const", &value)) {
 			global_objdb->object_key_create(object_handle, "token_retransmits_before_loss_const",

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	pcaulfield at sourceware.org	2006-12-18 09:48:11

Modified files:
	cman/daemon    : ais.c 

Log message:
	Increase token timeout to 10s as per bz#216954

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.44.2.1&r2=1.44.2.2

--- cluster/cman/daemon/ais.c	2006/11/09 13:51:15	1.44.2.1
+++ cluster/cman/daemon/ais.c	2006/12/18 09:48:11	1.44.2.2
@@ -482,11 +482,11 @@
 		objdb->object_key_create(object_handle, "vsftype", strlen("vsftype"),
 					 "none", strlen("none")+1);
 
-		/* Set the token timeout is 5 seconds - 20 losses, but don't overrride anything that
+		/* Set the token timeout is 10 seconds, but don't overrride anything that
 		   might be in cluster.conf */
 		if (objdb_get_string(objdb, object_handle, "token", &value)) {
 			global_objdb->object_key_create(object_handle, "token", strlen("token"),
-							"5000", strlen("5000")+1);
+							"10000", strlen("10000")+1);
 		}
 		if (objdb_get_string(objdb, object_handle, "token_retransmits_before_loss_const", &value)) {
 			global_objdb->object_key_create(object_handle, "token_retransmits_before_loss_const",

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL50
Changes by:	pcaulfield at sourceware.org	2006-12-18 09:49:24

Modified files:
	cman/daemon    : ais.c 

Log message:
	Increase token timeout to 10s as per bz#216954

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&only_with_tag=RHEL50&r1=1.44.4.1&r2=1.44.4.2

--- cluster/cman/daemon/ais.c	2006/11/09 13:50:42	1.44.4.1
+++ cluster/cman/daemon/ais.c	2006/12/18 09:49:24	1.44.4.2
@@ -482,11 +482,11 @@
 		objdb->object_key_create(object_handle, "vsftype", strlen("vsftype"),
 					 "none", strlen("none")+1);
 
-		/* Set the token timeout is 5 seconds - 20 losses, but don't overrride anything that
+		/* Set the token timeout is 10 seconds, but don't overrride anything that
 		   might be in cluster.conf */
 		if (objdb_get_string(objdb, object_handle, "token", &value)) {
 			global_objdb->object_key_create(object_handle, "token", strlen("token"),
-							"5000", strlen("5000")+1);
+							"10000", strlen("10000")+1);
 		}
 		if (objdb_get_string(objdb, object_handle, "token_retransmits_before_loss_const", &value)) {
 			global_objdb->object_key_create(object_handle, "token_retransmits_before_loss_const",

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2007-05-03 12:18:02

Modified files:
	cman/daemon    : ais.c 

Log message:
	Change unsigned char* to char* for compatibility with openais trunk.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.46&r2=1.47

--- cluster/cman/daemon/ais.c	2006/12/18 09:37:45	1.46
+++ cluster/cman/daemon/ais.c	2007/05/03 12:18:02	1.47
@@ -134,7 +134,7 @@
  * Exports the interface for the service
  */
 static struct openais_service_handler cman_service_handler = {
-	.name		    		= (unsigned char *)"openais CMAN membership service 2.01",
+	.name		    		= (char *)"openais CMAN membership service 2.01",
 	.id			        = CMAN_SERVICE,
 	.flow_control			= OPENAIS_FLOW_CONTROL_NOT_REQUIRED,
 	.lib_exit_fn		       	= cman_exit_fn,

[Cluster-devel] cluster/cman/daemon ais.c

[Steven Dake]

Patrick,

Ignore my last comments.

This change was made for the Solaris port.  There appears to be some
problem with using unsigned char for strings on that platform.

Regards
-steve

On Thu, 2007-05-03 at 19:30 -0700, Steven Dake wrote:
> Patrick,
> 
> openais trunk is broken in this regard.  The type should be unsigned
> char.
> 
> Please revert this change - i'll update trunk with the proper typing.
> 
> Regards
> -steve
> 
> On Thu, 2007-05-03 at 12:18 +0000, pcaulfield at sourceware.org wrote:
> > CVSROOT:	/cvs/cluster
> > Module name:	cluster
> > Changes by:	pcaulfield at sourceware.org	2007-05-03 12:18:02
> > 
> > Modified files:
> > 	cman/daemon    : ais.c 
> > 
> > Log message:
> > 	Change unsigned char* to char* for compatibility with openais trunk.
> > 
> > Patches:
> > http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.46&r2=1.47
> > 
> > --- cluster/cman/daemon/ais.c	2006/12/18 09:37:45	1.46
> > +++ cluster/cman/daemon/ais.c	2007/05/03 12:18:02	1.47
> > @@ -134,7 +134,7 @@
> >   * Exports the interface for the service
> >   */
> >  static struct openais_service_handler cman_service_handler = {
> > -	.name		    		= (unsigned char *)"openais CMAN membership service 2.01",
> > +	.name		    		= (char *)"openais CMAN membership service 2.01",
> >  	.id			        = CMAN_SERVICE,
> >  	.flow_control			= OPENAIS_FLOW_CONTROL_NOT_REQUIRED,
> >  	.lib_exit_fn		       	= cman_exit_fn,
> > 
> 

[Cluster-devel] cluster/cman/daemon ais.c

[Steven Dake]

Patrick,

openais trunk is broken in this regard.  The type should be unsigned
char.

Please revert this change - i'll update trunk with the proper typing.

Regards
-steve

On Thu, 2007-05-03 at 12:18 +0000, pcaulfield at sourceware.org wrote:
> CVSROOT:	/cvs/cluster
> Module name:	cluster
> Changes by:	pcaulfield at sourceware.org	2007-05-03 12:18:02
> 
> Modified files:
> 	cman/daemon    : ais.c 
> 
> Log message:
> 	Change unsigned char* to char* for compatibility with openais trunk.
> 
> Patches:
> http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.46&r2=1.47
> 
> --- cluster/cman/daemon/ais.c	2006/12/18 09:37:45	1.46
> +++ cluster/cman/daemon/ais.c	2007/05/03 12:18:02	1.47
> @@ -134,7 +134,7 @@
>   * Exports the interface for the service
>   */
>  static struct openais_service_handler cman_service_handler = {
> -	.name		    		= (unsigned char *)"openais CMAN membership service 2.01",
> +	.name		    		= (char *)"openais CMAN membership service 2.01",
>  	.id			        = CMAN_SERVICE,
>  	.flow_control			= OPENAIS_FLOW_CONTROL_NOT_REQUIRED,
>  	.lib_exit_fn		       	= cman_exit_fn,
> 

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2007-05-09 16:16:47

Modified files:
	cman/daemon    : ais.c 

Log message:
	Don't override <totem secauth>  if it appears in cluster.conf.
	This allows users to disable encryption if they want.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.47&r2=1.48

--- cluster/cman/daemon/ais.c	2007/05/03 12:18:02	1.47
+++ cluster/cman/daemon/ais.c	2007/05/09 16:16:47	1.48
@@ -515,9 +515,11 @@
 							"none", strlen("none")+1);
 		}
 
-		sprintf(tmp, "%d", 1);
-		objdb->object_key_create(object_handle, "secauth", strlen("secauth"),
-					 tmp, strlen(tmp)+1);
+		if (objdb_get_string(objdb, object_handle, "secauth", &value)) {
+			sprintf(tmp, "%d", 1);
+			objdb->object_key_create(object_handle, "secauth", strlen("secauth"),
+						 tmp, strlen(tmp)+1);
+		}
 
 		if (key_filename)
 		{

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	pcaulfield at sourceware.org	2007-05-10 09:05:16

Modified files:
	cman/daemon    : ais.c 

Log message:
	Don't override <totem secauth>  if it appears in cluster.conf.
	This allows users to disable encryption if they want.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.44.2.2&r2=1.44.2.3

--- cluster/cman/daemon/ais.c	2006/12/18 09:48:11	1.44.2.2
+++ cluster/cman/daemon/ais.c	2007/05/10 09:05:16	1.44.2.3
@@ -515,9 +515,11 @@
 							"none", strlen("none")+1);
 		}
 
-		sprintf(tmp, "%d", 1);
-		objdb->object_key_create(object_handle, "secauth", strlen("secauth"),
-					 tmp, strlen(tmp)+1);
+		if (objdb_get_string(objdb, object_handle, "secauth", &value)) {
+			sprintf(tmp, "%d", 1);
+			objdb->object_key_create(object_handle, "secauth", strlen("secauth"),
+						 tmp, strlen(tmp)+1);
+		}
 
 		if (key_filename)
 		{

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2007-10-01 12:36:59

Modified files:
	cman/daemon    : ais.c 

Log message:
	Use "logger_subsys" & "subsys" keys rather than "logger" and "ident".

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.50&r2=1.51

--- cluster/cman/daemon/ais.c	2007/09/17 08:03:36	1.50
+++ cluster/cman/daemon/ais.c	2007/10/01 12:36:58	1.51
@@ -561,22 +561,13 @@
 		}
 
 		objdb->object_create(object_handle, &logger_object_handle,
-				      "logger", strlen("logger"));
-		objdb->object_key_create(logger_object_handle, "ident", strlen("ident"),
+				      "logger_subsys", strlen("logger_subsys"));
+		objdb->object_key_create(logger_object_handle, "subsys", strlen("subsys"),
 					 "CMAN", strlen("CMAN")+1);
 
 		if (debug_mask)
-		{
-			objdb->object_key_create(object_handle, "to_stderr", strlen("to_stderr"),
-						 "yes", strlen("yes")+1);
 			objdb->object_key_create(logger_object_handle, "debug", strlen("debug"),
 						 "on", strlen("on")+1);
-		}
-		else
-		{
-			objdb->object_key_create(object_handle, "to_syslog", strlen("to_syslog"),
-						 "yes", strlen("yes")+1);
-		}
 	}
 
 	/* Don't run under user "ais" */

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2007-10-15 14:48:59

Modified files:
	cman/daemon    : ais.c 

Log message:
	Make sure it compiles against latest openais trunk.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.52&r2=1.53

--- cluster/cman/daemon/ais.c	2007/10/03 10:06:21	1.52
+++ cluster/cman/daemon/ais.c	2007/10/15 14:48:59	1.53
@@ -28,6 +28,7 @@
 #include <netdb.h>
 
 /* openais headers */
+#include <openais/service/objdb.h>
 #include <openais/service/swab.h>
 #include <openais/totem/totemip.h>
 #include <openais/totem/totempg.h>

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2007-11-01 14:06:02

Modified files:
	cman/daemon    : ais.c 

Log message:
	Enable to_stderr logging if 'cman_tool join -d' is used.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.53&r2=1.54

--- cluster/cman/daemon/ais.c	2007/10/15 14:48:59	1.53
+++ cluster/cman/daemon/ais.c	2007/11/01 14:06:01	1.54
@@ -570,9 +570,12 @@
 		objdb->object_key_create(logger_object_handle, "subsys", strlen("subsys"),
 					 "CMAN", strlen("CMAN")+1);
 
-		if (debug_mask)
+		if (debug_mask) {
 			objdb->object_key_create(logger_object_handle, "debug", strlen("debug"),
 						 "on", strlen("on")+1);
+			objdb->object_key_create(object_handle, "to_stderr", strlen("to_stderr"),
+						 "yes", strlen("yes")+1);
+		}
 	}
 
 	/* Don't run under user "ais" */

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2007-12-13 13:39:58

Modified files:
	cman/daemon    : ais.c 

Log message:
	Allow rrp_mode to be overridden in cluster.conf

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.55&r2=1.56

--- cluster/cman/daemon/ais.c	2007/11/29 11:19:12	1.55
+++ cluster/cman/daemon/ais.c	2007/12/13 13:39:58	1.56
@@ -518,13 +518,15 @@
 
 
 		/* Set RRP mode appropriately */
-		if (num_interfaces > 1) {
-			global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),
-							"active", strlen("active")+1);
-		}
-		else {
-			global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),
-							"none", strlen("none")+1);
+		if (objdb_get_string(objdb, object_handle, "rrp_mode", &value)) {
+			if (num_interfaces > 1) {
+				global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),
+								"active", strlen("active")+1);
+			}
+			else {
+				global_objdb->object_key_create(object_handle, "rrp_mode", strlen("rrp_mode"),
+								"none", strlen("none")+1);
+			}
 		}
 
 		if (objdb_get_string(objdb, object_handle, "secauth", &value)) {

[Cluster-devel] cluster/cman/daemon ais.c

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-12-30 09:30:15

Modified files:
	cman/daemon    : ais.c 

Log message:
	Fix error reporting to aisexec.
	
	aisexec expects an error_string string set by config_read if config_read fails.
	The lack of error_string is not checked by aisexec that will segfault.
	
	Set error_string properly and clean up the old errorstring that is not used.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.56&r2=1.57

--- cluster/cman/daemon/ais.c	2007/12/13 13:39:58	1.56
+++ cluster/cman/daemon/ais.c	2007/12/30 09:30:15	1.57
@@ -62,7 +62,6 @@
 int num_ais_nodes;
 
 static int config_run;
-static char errorstring[512];
 static int startup_pipe;
 static unsigned int debug_mask;
 static int first_trans = 1;
@@ -231,7 +230,7 @@
 	if (error)
 	{
 		write_cman_pipe("Error reading config from CCS");
-		sprintf(errorstring, "Error reading config from CCS");
+		*error_string = "Error reading config from CCS";
 		return -1;
 	}
 

[Cluster-devel] cluster/cman/daemon ais.c

[fabbione]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-12-31 05:15:46

Modified files:
	cman/daemon    : ais.c 

Log message:
	aisexec config parser expects error_string to be set also when we successfully
	read the configuration.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&r1=1.57&r2=1.58

--- cluster/cman/daemon/ais.c	2007/12/30 09:30:15	1.57
+++ cluster/cman/daemon/ais.c	2007/12/31 05:15:43	1.58
@@ -239,6 +239,8 @@
 
 	config_run = 1;
 
+	*error_string = "Successfully read configuration from CCS";
+
 	return 0;
 }
 

[Cluster-devel] cluster/cman/daemon ais.c

[pcaulfield]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	pcaulfield at sourceware.org	2008-01-02 11:05:33

Modified files:
	cman/daemon    : ais.c 

Log message:
	Don't know why I bothered coming in to work today

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/daemon/ais.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.44.2.4&r2=1.44.2.5

--- cluster/cman/daemon/ais.c	2008/01/02 10:56:21	1.44.2.4
+++ cluster/cman/daemon/ais.c	2008/01/02 11:05:33	1.44.2.5
@@ -29,7 +29,7 @@
 
 /* openais headers */
 #include <openais/totem/totemip.h>
-//#include <openais/service/objdb.h>
+#include <openais/service/objdb.h>
 #include <openais/totem/totempg.h>
 #include <openais/totem/aispoll.h>
 #include <openais/service/service.h>