Rev 143: add debug tracing to fetch_lock in http://samba.org/~tridge/ctdb

[tridge]

------------------------------------------------------------
revno: 143
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Tue 2007-04-17 22:39:23 +1000
message:
  add debug tracing to fetch_lock
modified:
  common/ctdb.c                  ctdb.c-20061127094323-t50f58d65iaao5of-2
  common/ctdb_client.c           ctdb_client.c-20070411010216-3kd8v37k61steeya-1
=== modified file 'common/ctdb.c'
--- a/common/ctdb.c     2007-04-17 12:13:06 +0000
+++ b/common/ctdb.c     2007-04-17 12:39:23 +0000
@@ -285,8 +285,11 @@
                expected++;
        }
        while (ctdb->num_connected != expected) {
+               DEBUG(3,("ctdb_connect_wait: waiting for %d nodes (have %d)\n", 
+                        expected, ctdb->num_connected));
                event_loop_once(ctdb->ev);
        }
+       DEBUG(3,("ctdb_connect_wait: got all %d nodes\n", expected));
 }
 
 /*

=== modified file 'common/ctdb_client.c'
--- a/common/ctdb_client.c      2007-04-17 12:13:06 +0000
+++ b/common/ctdb_client.c      2007-04-17 12:39:23 +0000
@@ -414,6 +414,8 @@
        r.hdr.ctdb_magic = CTDB_MAGIC;
        r.hdr.ctdb_version = CTDB_VERSION;
        r.hdr.operation = CTDB_REQ_CONNECT_WAIT;
+
+       DEBUG(3,("ctdb_connect_wait: sending to ctdbd\n"));
        
        res = ctdb_queue_send(ctdb->daemon.queue, (uint8_t *)&r.hdr, 
r.hdr.length);
        if (res != 0) {
@@ -421,6 +423,8 @@
                return;
        }
 
+       DEBUG(3,("ctdb_connect_wait: waiting\n"));
+
        /* now we can go into the normal wait routine, as the reply packet
           will update the ctdb->num_connected variable */
        ctdb_daemon_connect_wait(ctdb);
@@ -556,6 +560,9 @@
        }
        h->data    = data;
 
+       DEBUG(3,("ctdb_fetch_lock: key=%*.*s\n", key.dsize, key.dsize, 
+                (const char *)key.dptr));
+
        /* step 1 - get the chain lock */
        ret = ctdb_ltdb_lock(ctdb_db, key);
        if (ret != 0) {
@@ -564,6 +571,8 @@
                return NULL;
        }
 
+       DEBUG(4,("ctdb_fetch_lock: got chain lock\n"));
+
        talloc_set_destructor(h, fetch_lock_destructor);
 
        ret = ctdb_ltdb_fetch(ctdb_db, key, &h->header, ctdb_db, data);
@@ -572,19 +581,26 @@
                return NULL;
        }
 
+       DEBUG(4,("ctdb_fetch_lock: done local fetch\n"));
+
        /* step 2 - check if we are the dmaster */
        if (h->header.dmaster == ctdb_db->ctdb->vnn) {
+               DEBUG(4,("ctdb_fetch_lock: we are dmaster - done\n"));
                return h;
        }
 
        /* we're not the dmaster - ask the ctdb daemon to make us dmaster */
        state = ctdb_client_fetch_lock_send(ctdb_db, mem_ctx, key, &h->header);
+       DEBUG(4,("ctdb_fetch_lock: done fetch_lock_send\n"));
        ret = ctdb_client_fetch_lock_recv(state, mem_ctx, key, &h->header, 
data);
        if (ret != 0) {
+               DEBUG(4,("ctdb_fetch_lock: fetch_lock_recv failed\n"));
                talloc_free(h);
                return NULL;
        }
 
+       DEBUG(4,("ctdb_fetch_lock: record is now local\n"));
+
        /* the record is now local, and locked. update the record on disk
           to mark us as the dmaster*/
        h->header.dmaster = ctdb_db->ctdb->vnn;
@@ -595,6 +611,8 @@
                return NULL;
        }
 
+       DEBUG(4,("ctdb_fetch_lock: done\n"));
+
        /* give the caller a handle to be used for ctdb_record_store() or a 
cancel via
           a talloc_free() */
        return h;