From 441ad00af842a8b7b5291de60d8ab08a064f5327 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Wed, 10 Nov 2010 14:46:05 +1100 Subject: [PATCH] Dont check remote ip allocation if public ip mgmt is disabled --- server/ctdb_recoverd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c index fca15832..5639d5b2 100644 --- a/server/ctdb_recoverd.c +++ b/server/ctdb_recoverd.c @@ -1277,10 +1277,12 @@ static int ctdb_reload_remote_public_ips(struct ctdb_context *ctdb, return -1; } - 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; + if (ctdb->tunable.disable_ip_failover == 0) { + 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; + } } } -- 2.34.1