Rev 677: don't do the first startup event until we are out of recovery in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 677
revision-id:tridge at samba.org-20071112021015-2vs75yqqbllm60db
parent: tridge at samba.org-20071111235311-be18d7889z943fa2
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge.stable
timestamp: Mon 2007-11-12 13:10:15 +1100
message:
  don't do the first startup event until we are out of recovery
modified:
  server/ctdb_monitor.c          ctdb_monitor.c-20070518100625-8jf4ft1mjzmb22ck-1
=== modified file 'server/ctdb_monitor.c'
--- a/server/ctdb_monitor.c	2007-11-11 23:53:11 +0000
+++ b/server/ctdb_monitor.c	2007-11-12 02:10:15 +0000
@@ -171,7 +171,8 @@
 	struct ctdb_context *ctdb = talloc_get_type(private_data, struct ctdb_context);
 	int ret;
 
-	if (ctdb->monitoring_mode == CTDB_MONITORING_DISABLED && ctdb->done_startup) {
+	if (ctdb->recovery_mode != CTDB_RECOVERY_NORMAL ||
+	    (ctdb->monitoring_mode == CTDB_MONITORING_DISABLED && ctdb->done_startup)) {
 		event_add_timed(ctdb->ev, ctdb->monitor_context,
 				timeval_current_ofs(ctdb->tunable.monitor_interval, 0), 
 				ctdb_check_health, ctdb);