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>

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index a63021e4d8b69ae26575b55d2c5a77125876d19e..473e6cbe8cc8d3bf9c6beda4a8582a2d253d0a00 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;