Dont check ip assignment across the cluster while ip-verification

checks are disabled

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index c2f441bdfd0e2868112bb7986a901d453a6feea1..dd678cf507c656d1fce1e16c51d374d5fa4e434c 100644 (file)
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -3124,9 +3124,11 @@ again:
                        goto again;
                }
 
-               if (verify_remote_ip_allocation(ctdb, ctdb->nodes[j]->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]->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;
+                       }
                }
        }