From f63f2a0ee39ae7ea849580a7ad455cbcd70a43db Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 21 Jan 2019 16:36:13 +1100 Subject: [PATCH] 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 Reviewed-by: Amitay Isaacs (cherry picked from commit 7e4aae6943291c3144c8a3ff97537e8d4c7dc7c9) --- ctdb/server/ctdb_recoverd.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 20b6e44e7ae..ed055bdcdfe 100644 --- 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; -- 2.11.4.GIT