From: Amitay Isaacs Date: Thu, 22 Jun 2017 06:15:47 +0000 (+1000) Subject: ctdb-recovery: Do not run local ip verification when in recovery X-Git-Tag: samba-4.5.11~21 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17543bd02cc2f11080e618444cb2250dd5764fda;p=thirdparty%2Fsamba.git ctdb-recovery: Do not run local ip verification when in recovery BUG: https://bugzilla.samba.org/show_bug.cgi?id=12857 If we drop public IPs because CTDB is in recovery for too long, then avoid spamming logs "Trigger takeoverrun" every second. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke (cherry picked from commit ea46699b27ef8d4ac7b5dd07035465cb3df09ea4) Autobuild-User(v4-5-test): Karolin Seeger Autobuild-Date(v4-5-test): Mon Jun 26 16:57:51 CEST 2017 on sn-devel-144 --- diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index c7f31e321c1..f947ee065c7 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -2658,9 +2658,11 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec, return; } - /* Check if an IP takeover run is needed and trigger one if - * necessary */ - verify_local_ip_allocation(ctdb, rec, pnn, nodemap); + if (ctdb->recovery_mode == CTDB_RECOVERY_NORMAL) { + /* Check if an IP takeover run is needed and trigger one if + * necessary */ + verify_local_ip_allocation(ctdb, rec, pnn, nodemap); + } /* if we are not the recmaster then we do not need to check if recovery is needed