From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Sat, 2 Jun 2007 23:58:51 +0000 (+1000)
Subject: when we get a dmaster error,   show the database id in the log so we can
X-Git-Tag: tevent-0.9.20~348^2~2588^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61136d0da0ba061e4b7d723c7343f827e9fa7cc3;p=thirdparty%2Fsamba.git

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 6145605b5ab..5ec86f3142f 100644
--- 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;
 	}