From: Amitay Isaacs <amitay@gmail.com>
Date: Wed, 7 Jun 2017 06:45:50 +0000 (+1000)
Subject: ctdb-locking: There are no ALLDB locks any more
X-Git-Tag: tevent-0.9.32~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5304b7023df755a23a516a10a1c94f28f1446813;p=thirdparty%2Fsamba.git

ctdb-locking: There are no ALLDB locks any more

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c
index b2c6d1507e5..cbbdaa84604 100644
--- a/ctdb/server/ctdb_lock.c
+++ b/ctdb/server/ctdb_lock.c
@@ -404,16 +404,10 @@ static void ctdb_lock_timeout_handler(struct tevent_context *ev,
 	ctdb = lock_ctx->ctdb;
 
 	elapsed_time = timeval_elapsed(&lock_ctx->start_time);
-	if (lock_ctx->ctdb_db) {
-		DEBUG(DEBUG_WARNING,
-		      ("Unable to get %s lock on database %s for %.0lf seconds\n",
-		       (lock_ctx->type == LOCK_RECORD ? "RECORD" : "DB"),
-		       lock_ctx->ctdb_db->db_name, elapsed_time));
-	} else {
-		DEBUG(DEBUG_WARNING,
-		      ("Unable to get ALLDB locks for %.0lf seconds\n",
-		       elapsed_time));
-	}
+	DEBUG(DEBUG_WARNING,
+	      ("Unable to get %s lock on database %s for %.0lf seconds\n",
+	       (lock_ctx->type == LOCK_RECORD ? "RECORD" : "DB"),
+	       lock_ctx->ctdb_db->db_name, elapsed_time));
 
 	/* If a node stopped/banned, don't spam the logs */
 	if (ctdb->nodes[ctdb->pnn]->flags & NODE_FLAGS_INACTIVE) {