From ce17a8b60506500ae141ec5247daca0b92424030 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Thu, 23 Jun 2016 21:07:37 +1000 Subject: [PATCH] ctdb-recovery: Terminate if recovery fails without any banning credits In case of database recovery failure, if there are no banning credits assigned, then the async computation is never terminated. The else condition is missing in (max_credits >= NUM_RETRIES) check. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Fri Jun 24 09:56:23 CEST 2016 on sn-devel-144 (cherry picked from commit 600cec4d44a01391230a81efeece5155a97c8298) --- ctdb/server/ctdb_recovery_helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ctdb/server/ctdb_recovery_helper.c b/ctdb/server/ctdb_recovery_helper.c index 24aa42f..086dd16 100644 --- a/ctdb/server/ctdb_recovery_helper.c +++ b/ctdb/server/ctdb_recovery_helper.c @@ -2609,6 +2609,8 @@ static void recovery_db_recovery_done(struct tevent_req *subreq) } tevent_req_set_callback(subreq, recovery_failed_done, req); + } else { + tevent_req_error(req, EIO); } return; } -- 2.7.4