when we get a dmaster error, show the database id in the log so we can

track which db it happens for

(This used to be ctdb commit 3aedb67f4adf769b605b43f9d39d34ef17b0085d)

diff --git a/ctdb/common/ctdb_call.c b/ctdb/common/ctdb_call.c
index 6145605b5ab77f273755e791bb5e75defdcc1252..5ec86f3142f3450cbb267a2c9556c098c722be88 100644 (file)
--- a/ctdb/common/ctdb_call.c
+++ b/ctdb/common/ctdb_call.c
@@ -394,8 +394,8 @@ void ctdb_request_dmaster(struct ctdb_context *ctdb, struct ctdb_req_header *hdr
 
        /* its a protocol error if the sending node is not the current dmaster */
        if (header.dmaster != hdr->srcnode) {
-               DEBUG(0,("vnn %u dmaster request non-master %u dmaster=%u key %08x\n",
-                        ctdb->vnn, hdr->srcnode, header.dmaster, ctdb_hash(&key)));
+               DEBUG(0,("vnn %u dmaster request non-master %u dmaster=%u key %08x dbid:%08x\n",
+                        ctdb->vnn, hdr->srcnode, header.dmaster, ctdb_hash(&key), c->db_id));
                ctdb_fatal(ctdb, "ctdb_req_dmaster from non-master");
                return;
        }