Rev 659: added some debug lines to help track down a problem in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 659
revision-id: tridge at samba.org-20071018062736-qylrh3g7sxiik8xy
parent: tridge at samba.org-20071018055115-ei6mwy91qs3iu4ok
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Thu 2007-10-18 16:27:36 +1000
message:
  added some debug lines to help track down a problem
modified:
  server/ctdb_recover.c          ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1
  server/ctdb_recoverd.c         recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
=== modified file 'server/ctdb_recover.c'
--- a/server/ctdb_recover.c	2007-10-18 05:44:02 +0000
+++ b/server/ctdb_recover.c	2007-10-18 06:27:36 +0000
@@ -773,7 +773,7 @@
 	}
 	ctdb->recovery_lock_fd = open(ctdb->recovery_lock_file, O_RDWR|O_CREAT, 0600);
 	if (ctdb->recovery_lock_fd == -1) {
-		DEBUG(0,("Unable to open %s - (%s)\n", 
+		DEBUG(0,("ctdb_recovery_lock: Unable to open %s - (%s)\n", 
 			 ctdb->recovery_lock_file, strerror(errno)));
 		return false;
 	}
@@ -789,6 +789,9 @@
 	if (fcntl(ctdb->recovery_lock_fd, F_SETLK, &lock) != 0) {
 		close(ctdb->recovery_lock_fd);
 		ctdb->recovery_lock_fd = -1;
+		if (keep) {
+			DEBUG(0,("ctdb_recovery_lock: Failed to get recovery lock on '%s'\n", ctdb->recovery_lock_file));
+		}
 		return false;
 	}
 
@@ -797,5 +800,7 @@
 		ctdb->recovery_lock_fd = -1;
 	}
 
+	DEBUG(0,("ctdb_recovery_lock: Got recovery lock on '%s'\n", ctdb->recovery_lock_file));
+
 	return true;
 }

=== modified file 'server/ctdb_recoverd.c'
--- a/server/ctdb_recoverd.c	2007-10-15 04:28:51 +0000
+++ b/server/ctdb_recoverd.c	2007-10-18 06:27:36 +0000
@@ -806,6 +806,8 @@
 	uint32_t generation;
 	struct ctdb_dbid_map *dbmap;
 
+	DEBUG(0, (__location__ " Starting do_recovery\n"));
+
 	/* if recovery fails, force it again */
 	rec->need_recovery = true;
 
@@ -1511,6 +1513,8 @@
 	struct ctdb_all_public_ips *ips;
 	char c;
 
+	DEBUG(0,("monitor_cluster starting\n"));
+
 	rec = talloc_zero(ctdb, struct ctdb_recoverd);
 	CTDB_NO_MEMORY_FATAL(ctdb, rec);