From: Amitay Isaacs <amitay@gmail.com>
Date: Thu, 23 Jun 2016 11:07:37 +0000 (+1000)
Subject: ctdb-recovery: Terminate if recovery fails without any banning credits
X-Git-Tag: tdb-1.3.10~729
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=600cec4d44a01391230a81efeece5155a97c8298;p=thirdparty%2Fsamba.git

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 <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Fri Jun 24 09:56:23 CEST 2016 on sn-devel-144
---

diff --git a/ctdb/server/ctdb_recovery_helper.c b/ctdb/server/ctdb_recovery_helper.c
index 691196e5701..6b487b9b852 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;
 	}