ctdb-recoverd: Clean up logging on failure to take recovery lock

Add an explicit case for a timeout and clean up the other messages.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13800

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 7e4aae6943291c3144c8a3ff97537e8d4c7dc7c9)

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 20b6e44e7aef4aa4425a462df9ff140d70d5b3f3..ed055bdcdfed26a60262c4efb8294450fe957510 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -913,12 +913,15 @@ static void take_reclock_handler(char status,
                break;
 
        case '1':
-               DEBUG(DEBUG_ERR,
-                     ("Unable to take recovery lock - contention\n"));
+               D_ERR("Unable to take recovery lock - contention\n");
+               break;
+
+       case '2':
+               D_ERR("Unable to take recovery lock - timeout\n");
                break;
 
        default:
-               DEBUG(DEBUG_ERR, ("ERROR: when taking recovery lock\n"));
+               D_ERR("Unable to take recover lock - unknown error\n");
        }
 
        s->done = true;