From mboxrd@z Thu Jan  1 00:00:00 1970
From: pcaulfield@sourceware.org <pcaulfield@sourceware.org>
Date: 9 Nov 2006 13:10:43 -0000
Subject: [Cluster-devel] cluster/cman/daemon ais.c
Message-ID: <20061109131043.22926.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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"),