Rev 757: get rid of monitor_retry as well in http://samba.org/~tridge/ctdb

tridge at samba.org tridge at samba.org
Thu Jan 10 03:49:43 GMT 2008


------------------------------------------------------------
revno: 757
revision-id:tridge at samba.org-20080110034943-sfhzkpoem9nxsnqb
parent: tridge at samba.org-20080110034056-v7et0v8ap3741v0x
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge.stable
timestamp: Thu 2008-01-10 14:49:43 +1100
message:
  get rid of monitor_retry as well
modified:
  include/ctdb_private.h         ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
  server/ctdb_monitor.c          ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h	2008-01-10 03:40:56 +0000
+++ b/include/ctdb_private.h	2008-01-10 03:49:43 +0000
@@ -80,7 +80,6 @@
 	uint32_t election_timeout;
 	uint32_t takeover_timeout;
 	uint32_t monitor_interval;
-	uint32_t monitor_retry;
 	uint32_t tickle_update_interval;
 	uint32_t script_timeout;
 	uint32_t recovery_grace_period;

=== modified file 'server/ctdb_monitor.c'
--- a/server/ctdb_monitor.c	2008-01-10 03:40:56 +0000
+++ b/server/ctdb_monitor.c	2008-01-10 03:49:43 +0000
@@ -189,8 +189,9 @@
 
 	if (ret != 0) {
 		DEBUG(0,("Unable to launch monitor event script\n"));
+		ctdb->monitor->next_interval = 1;
 		event_add_timed(ctdb->ev, ctdb->monitor->monitor_context, 
-				timeval_current_ofs(ctdb->tunable.monitor_retry, 0), 
+				timeval_current_ofs(1, 0), 
 				ctdb_check_health, ctdb);
 	}	
 }
@@ -253,7 +254,7 @@
 	CTDB_NO_MEMORY_FATAL(ctdb, te);
 
 	te = event_add_timed(ctdb->ev, ctdb->monitor->monitor_context,
-			     timeval_current_ofs(ctdb->tunable.monitor_retry, 0), 
+			     timeval_current_ofs(1, 0), 
 			     ctdb_check_health, ctdb);
 	CTDB_NO_MEMORY_FATAL(ctdb, te);
 



More information about the samba-cvs mailing list