Gitweb:
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: d15ab26309f1d357387ebbd8a205c6416d0398e7
Parent: 4fe4dbb1e1261b2cfa471840134f27043f683385
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Mar 16 16:24:27 2011 +0100
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Fri Mar 18 09:40:05 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
Acked-by: Lon Hohberger <lhh(a)redhat.com>
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
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 972a814..b821826 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -83,7 +83,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 5e70c0e..05c3bc7 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.