ctdb-locking: There are no ALLDB locks any more
authorAmitay Isaacs <amitay@gmail.com>
Wed, 7 Jun 2017 06:45:50 +0000 (16:45 +1000)
committerMartin Schwenke <martins@samba.org>
Mon, 19 Jun 2017 13:44:14 +0000 (15:44 +0200)
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
ctdb/server/ctdb_lock.c

index b2c6d1507e591564ad63be9e1b7c8987bdcea92c..cbbdaa846043962fd5b72d4e910267588a3227bf 100644 (file)
@@ -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) {