ctdb-ipalloc: Fix cumulative takeover timeout
authorMartin Schwenke <martin@meltin.net>
Thu, 18 Aug 2016 02:57:33 +0000 (12:57 +1000)
committerAmitay Isaacs <amitay@samba.org>
Thu, 18 Aug 2016 10:36:37 +0000 (12:36 +0200)
commit626dcc9e493e2ac4fd502f75c7cb4d29f686f017
tree3671ae9241cdb2043a6d81abde770c19293b4c2c
parentb21308252eb409bad6089cc0f09fada0229d33e8
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
ctdb/server/ctdb_takeover.c