1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00

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 <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2017-06-22 16:15:47 +10:00 committed by Martin Schwenke
parent 2fd2ccd4c8
commit ea46699b27

View File

@ -2670,9 +2670,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