diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-01-21 16:36:13 +1100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-03-04 10:37:54 +0000 |
| commit | f63f2a0ee39ae7ea849580a7ad455cbcd70a43db (patch) | |
| tree | b76017946e7f76aad9a13cc094dd745d97c97ac4 | |
| parent | fb8c3bd89959d677f481dc2684f32ec33d66d9d5 (diff) | |
| download | samba-f63f2a0ee39ae7ea849580a7ad455cbcd70a43db.tar.gz | |
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)
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 9 |
1 files 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; |