[SCM] CTDB repository - branch master updated - ctdb-1.0.84-13-gfacddca

[Ronnie Sahlberg]

The branch, master has been updated
       via  facddcacb4a961cddb117818fa38a3e97770b2fa (commit)
      from  1205673499618f90f413fad9e96a88733b5ce359 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit facddcacb4a961cddb117818fa38a3e97770b2fa
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Jun 18 09:20:18 2009 +1000

    increase the timeout before we shutdown when ther ecovery daemon is hung

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in                                |    2 +-
 config/events.d/{11.routing => 99.routing} |    0 
 packaging/RPM/ctdb.spec                    |    2 +-
 server/ctdb_tunables.c                     |    4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename config/events.d/{11.routing => 99.routing} (100%)


Changeset truncated at 500 lines:

diff --git a/Makefile.in b/Makefile.in
index ea3a450..7d8050e 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -208,7 +208,6 @@ install: all
 	${INSTALLCMD} -m 755 config/events.d/00.ctdb $(DESTDIR)$(etcdir)/ctdb/events.d
 	${INSTALLCMD} -m 755 config/events.d/10.interface $(DESTDIR)$(etcdir)/ctdb/events.d
 	${INSTALLCMD} -m 755 config/events.d/11.natgw $(DESTDIR)$(etcdir)/ctdb/events.d
-	${INSTALLCMD} -m 755 config/events.d/11.routing $(DESTDIR)$(etcdir)/ctdb/events.d
 	${INSTALLCMD} -m 755 config/events.d/20.multipathd $(DESTDIR)$(etcdir)/ctdb/events.d
 	${INSTALLCMD} -m 644 config/events.d/31.clamd $(DESTDIR)$(etcdir)/ctdb/events.d
 	${INSTALLCMD} -m 755 config/events.d/40.vsftpd $(DESTDIR)$(etcdir)/ctdb/events.d
@@ -218,6 +217,7 @@ install: all
 	${INSTALLCMD} -m 755 config/events.d/61.nfstickle $(DESTDIR)$(etcdir)/ctdb/events.d
 	${INSTALLCMD} -m 755 config/events.d/70.iscsi $(DESTDIR)$(etcdir)/ctdb/events.d
 	${INSTALLCMD} -m 755 config/events.d/91.lvs $(DESTDIR)$(etcdir)/ctdb/events.d
+	${INSTALLCMD} -m 755 config/events.d/99.routing $(DESTDIR)$(etcdir)/ctdb/events.d
 	${INSTALLCMD} -m 755 tools/ctdb_diagnostics $(DESTDIR)$(bindir)
 	${INSTALLCMD} -m 755 tools/onnode $(DESTDIR)$(bindir)
 	if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1; fi
diff --git a/config/events.d/11.routing b/config/events.d/99.routing
similarity index 100%
rename from config/events.d/11.routing
rename to config/events.d/99.routing
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index d10a160..83b43c0 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -106,7 +106,6 @@ fi
 %{_sysconfdir}/ctdb/events.d/00.ctdb
 %{_sysconfdir}/ctdb/events.d/10.interface
 %{_sysconfdir}/ctdb/events.d/11.natgw
-%{_sysconfdir}/ctdb/events.d/11.routing
 %{_sysconfdir}/ctdb/events.d/20.multipathd
 %{_sysconfdir}/ctdb/events.d/31.clamd
 %{_sysconfdir}/ctdb/events.d/40.vsftpd
@@ -116,6 +115,7 @@ fi
 %{_sysconfdir}/ctdb/events.d/61.nfstickle
 %{_sysconfdir}/ctdb/events.d/70.iscsi
 %{_sysconfdir}/ctdb/events.d/91.lvs
+%{_sysconfdir}/ctdb/events.d/99.routing
 %{_sysconfdir}/ctdb/statd-callout
 %{_sbindir}/ctdbd
 %{_bindir}/ctdb
diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c
index 6a8876f..c10dc39 100644
--- a/server/ctdb_tunables.c
+++ b/server/ctdb_tunables.c
@@ -50,8 +50,8 @@ static const struct {
 	{ "ReclockPingPeriod",   60,  offsetof(struct ctdb_tunable,  reclock_ping_period) },
 	{ "NoIPFailback",         0,  offsetof(struct ctdb_tunable, no_ip_failback) },
 	{ "VerboseMemoryNames",   0,  offsetof(struct ctdb_tunable, verbose_memory_names) },
-	{ "RecdPingTimeout",	 20,  offsetof(struct ctdb_tunable, recd_ping_timeout) },
-	{ "RecdFailCount",	  3,  offsetof(struct ctdb_tunable, recd_ping_failcount) },
+	{ "RecdPingTimeout",	 60,  offsetof(struct ctdb_tunable, recd_ping_timeout) },
+	{ "RecdFailCount",	 10,  offsetof(struct ctdb_tunable, recd_ping_failcount) },
 	{ "LogLatencyMs",         0,  offsetof(struct ctdb_tunable, log_latency_ms) },
 	{ "RecLockLatencyMs",  1000,  offsetof(struct ctdb_tunable, reclock_latency_ms) },
 	{ "RecoveryDropAllIPs",  60,  offsetof(struct ctdb_tunable, recovery_drop_all_ips) },


-- 
CTDB repository