ctdb-recoverd: Unify takeover run triggering code in main loop

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Fri May 13 17:15:57 CEST 2016 on sn-devel-144

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 0839691268e1ba9c95dabfe4d42a6d9703241b75..09940dc32f881b05a277b5299510fa9bf576e8f0 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -3871,21 +3871,12 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
 
 takeover_run_checks:
 
-       /* if there are takeovers requested, perform it and notify the waiters */
+       /* If there are IP takeover runs requested or the previous one
+        * failed then perform one and notify the waiters */
        if (!ctdb_op_is_disabled(rec->takeover_run) &&
-           rec->reallocate_requests) {
+           (rec->reallocate_requests || rec->need_takeover_run)) {
                process_ipreallocate_requests(ctdb, rec);
        }
-
-       /* we might need to change who has what IP assigned */
-       if (rec->need_takeover_run) {
-               /* If takeover run fails, then the offending nodes are
-                * assigned ban culprit counts. And we re-try takeover.
-                * If takeover run fails repeatedly, the node would get
-                * banned.
-                */
-               do_takeover_run(rec, nodemap);
-       }
 }
 
 /*