added some debug lines to help track down a problem

(This used to be ctdb commit 2ca31e9de179f76e392a26cc8305e2473357c760)

diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c
index 644f0b3c9c5c5d85d9c861e4aea6e205104c65e1..3721facdba6ae1c484e76ca797c4f23e2e1c2eec 100644 (file)
--- a/ctdb/server/ctdb_recover.c
+++ b/ctdb/server/ctdb_recover.c
@@ -773,7 +773,7 @@ bool ctdb_recovery_lock(struct ctdb_context *ctdb, bool keep)
        }
        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 @@ bool ctdb_recovery_lock(struct ctdb_context *ctdb, bool keep)
        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 @@ bool ctdb_recovery_lock(struct ctdb_context *ctdb, bool keep)
                ctdb->recovery_lock_fd = -1;
        }
 
+       DEBUG(0,("ctdb_recovery_lock: Got recovery lock on '%s'\n", ctdb->recovery_lock_file));
+
        return true;
 }

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index d2990c3cdbcd9dd9cfc56853cdab824ae5444c0c..b56a1a7a4b396d8fede1368e7ccf3bd5ef87405f 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -806,6 +806,8 @@ static int do_recovery(struct ctdb_recoverd *rec,
        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 @@ static void monitor_cluster(struct ctdb_context *ctdb)
        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);