cluster: STABLE31 - cman init: increse the default timeout waiting for quorum

[Fabio M. Di Nitto]

Gitweb:       
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit:        e5dd95786c6850866f0ffa15fe9fe564cbd9f765
Parent:        a47bc261ef58cb056077c448c06a7c518dd4191d
Author:        Fabio M. Di Nitto <fdinitto(a)redhat.com&gt;
AuthorDate:    Wed Mar 16 16:24:27 2011 +0100
Committer:     Fabio M. Di Nitto <fdinitto(a)redhat.com&gt;
CommitterDate: Wed Mar 16 16:28:04 2011 +0100

cman init: increse the default timeout waiting for quorum

not all clusters can achieve quorum in 20 seconds. Bump to 45 by default.

Value is still tunable via sysconfig entry.

Resolves: rhbz#688201

Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com&gt;
---
 cman/init.d/cman.in               |    2 +-
 cman/init.d/cman.init.defaults.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 7d9c7d1..12f428f 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -84,7 +84,7 @@ fi
 #     startup quorum is needed by many other applications, so we may as
 #     well wait here.  If CMAN_QUORUM_TIMEOUT is zero, quorum will
 #     be ignored.
-[ -z "$CMAN_QUORUM_TIMEOUT" ] && CMAN_QUORUM_TIMEOUT=20
+[ -z "$CMAN_QUORUM_TIMEOUT" ] && CMAN_QUORUM_TIMEOUT=45
 
 # CMAN_SHUTDOWN_TIMEOUT -- amount of time to wait for cman to become a
 #     cluster member before calling cman_tool leave during shutdown.
diff --git a/cman/init.d/cman.init.defaults.in b/cman/init.d/cman.init.defaults.in
index 390e855..ac21c97 100644
--- a/cman/init.d/cman.init.defaults.in
+++ b/cman/init.d/cman.init.defaults.in
@@ -10,7 +10,7 @@
 #     startup quorum is needed by many other applications, so we may as
 #     well wait here.  If CMAN_QUORUM_TIMEOUT is zero, quorum will
 #     be ignored.
-#CMAN_QUORUM_TIMEOUT=20
+#CMAN_QUORUM_TIMEOUT=45
 
 # CMAN_SHUTDOWN_TIMEOUT -- amount of time to wait for cman to become a
 #     cluster member before calling cman_tool leave during shutdown.