ctdb-ipalloc: Fix cumulative takeover timeout
commit18334fd214795ad1e93f5d2dbc1d21c8405c8aaa
authorMartin Schwenke <martin@meltin.net>
Thu, 18 Aug 2016 02:57:33 +0000 (18 12:57 +1000)
committerStefan Metzmacher <metze@samba.org>
Wed, 24 Aug 2016 09:42:31 +0000 (24 11:42 +0200)
tree28bbb0a86e1e98c56c883f94b106ade30ed5fffd
parent46890c52e6e3d1e1545439972287e171249523ba
ctdb-ipalloc: Fix cumulative takeover timeout

Commit c40fc62642ff5ac49b75e9af49c299e33dbc9073 runs the IP allocation
algorithm after calculating the timeout offset.  If the algorithm
takes a long time then there may be no attempt to release or take over
IPs.

Instead, reset the timeout just before the RELEASE_IP stage if an
early jump to IPREALLOCATED was not taken.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12161

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): Thu Aug 18 12:36:37 CEST 2016 on sn-devel-144

(cherry picked from commit 626dcc9e493e2ac4fd502f75c7cb4d29f686f017)
ctdb/server/ctdb_takeover.c