Dont check ip assignment across the cluster while ip-verification

    checks are disabled
(cherry picked from commit 189f4a5af1053271b0834522e35c336df959aa03)

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 5f3ea9e4a45a2b12d72c457f12bab3624108dead..21aa55bf41154ae80d6431683f3c2f85cde3d9ce 100644 (file)
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -1287,9 +1287,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 */