The branch, master has been updated
via 626dcc9 ctdb-ipalloc: Fix cumulative takeover timeout
from b213082 s3: vfs: snapper: Fix snapper_gmt_strip_snapshot() function
to strip @GMT token identically to shadow_copy2.c:shadow_copy2_strip_snapshot()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 626dcc9e493e2ac4fd502f75c7cb4d29f686f017
Author: Martin Schwenke <[email protected]>
Date: Thu Aug 18 12:57:33 2016 +1000
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 <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Autobuild-User(master): Amitay Isaacs <[email protected]>
Autobuild-Date(master): Thu Aug 18 12:36:37 CEST 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
ctdb/server/ctdb_takeover.c | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index a02076d..ee4dbe1 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -1539,16 +1539,9 @@ int ctdb_takeover_run(struct ctdb_context *ctdb, struct
ctdb_node_map_old *nodem
return -1;
}
- /* Each of the later stages (RELEASE_IP, TAKEOVER_IP,
- * IPREALLOCATED) notionally has a timeout of TakeoverTimeout
- * seconds. However, RELEASE_IP can take longer due to TCP
- * connection killing, so sometimes needs more time.
- * Therefore, use a cumulative timeout of TakeoverTimeout * 3
- * seconds across all 3 stages. No explicit expiry checks are
- * needed before each stage because tevent is smart enough to
- * fire the timeouts even if they are in the past. Initialise
- * this here to cope with early jumps to IPREALLOCATED. */
- timeout = timeval_current_ofs(3 * ctdb->tunable.takeover_timeout,0);
+ /* Default timeout for early jump to IPREALLOCATED. See below
+ * for explanation of 3 times... */
+ timeout = timeval_current_ofs(3 * ctdb->tunable.takeover_timeout, 0);
/*
* ip failover is completely disabled, just send out the
@@ -1622,6 +1615,20 @@ int ctdb_takeover_run(struct ctdb_context *ctdb, struct
ctdb_node_map_old *nodem
ZERO_STRUCT(ip); /* Avoid valgrind warnings for union */
+ /* Each of the following stages (RELEASE_IP, TAKEOVER_IP,
+ * IPREALLOCATED) notionally has a timeout of TakeoverTimeout
+ * seconds. However, RELEASE_IP can take longer due to TCP
+ * connection killing, so sometimes needs more time.
+ * Therefore, use a cumulative timeout of TakeoverTimeout * 3
+ * seconds across all 3 stages. No explicit expiry checks are
+ * needed before each stage because tevent is smart enough to
+ * fire the timeouts even if they are in the past. Initialise
+ * this here so it explicitly covers the stages we're
+ * interested in but, in particular, not the time taken by the
+ * ipalloc().
+ */
+ timeout = timeval_current_ofs(3 * ctdb->tunable.takeover_timeout, 0);
+
/* Send a RELEASE_IP to all nodes that should not be hosting
* each IP. For each IP, all but one of these will be
* redundant. However, the redundant ones are used to tell
--
Samba Shared Repository
