From 189f4a5af1053271b0834522e35c336df959aa03 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Mon, 3 May 2010 15:52:02 +1000 Subject: [PATCH] Dont check ip assignment across the cluster while ip-verification checks are disabled --- server/ctdb_recoverd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c index f04d6091..3ee607e5 100644 --- a/server/ctdb_recoverd.c +++ b/server/ctdb_recoverd.c @@ -1275,9 +1275,11 @@ static int ctdb_reload_remote_public_ips(struct ctdb_context *ctdb, return -1; } - if (verify_remote_ip_allocation(ctdb, ctdb->nodes[j]->known_public_ips)) { - DEBUG(DEBUG_ERR,("Node %d has inconsistent public ip allocation and needs update.\n", ctdb->nodes[j]->pnn)); - rec->need_takeover_run = true; + if (rec->ip_check_disable_ctx == NULL) { + if (verify_remote_ip_allocation(ctdb, ctdb->nodes[j]->known_public_ips)) { + DEBUG(DEBUG_ERR,("Node %d has inconsistent public ip allocation and needs update.\n", ctdb->nodes[j]->pnn)); + rec->need_takeover_run = true; + } } /* grab a new shiny list of public ips from the node */ -- 2.34.1