IPALLOCATION : If the node is held pinned down in "init" state

[sahlberg/ctdb.git] / server / ctdb_takeover.c

diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index e3e6787c86974572e44b0ffe5ba1217faf582ee1..1d6fe6e4b8ba13c4a71b447501d227674ebb4e19 100644 (file)
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -594,10 +594,8 @@ int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
 
        if (vnn->iface == NULL && have_ip) {
                DEBUG(DEBUG_CRIT,(__location__ " takeoverip of IP %s is known to the kernel, "
-                                 "but we have no interface assigned, has someone manually configured it?"
-                                 "banning ourself\n",
+                                 "but we have no interface assigned, has someone manually configured it? Ignore for now.\n",
                                 ctdb_addr_to_str(&vnn->public_address)));
-               ctdb_ban_self(ctdb);
                return -1;
        }
 
@@ -794,12 +792,10 @@ int32_t ctdb_control_release_ip(struct ctdb_context *ctdb,
        }
 
        if (vnn->iface == NULL) {
-               DEBUG(DEBUG_CRIT,(__location__ " release_ip of IP %s is known to the kernel, "
-                                 "but we have no interface assigned, has someone manually configured it?"
-                                 "banning ourself\n",
+               DEBUG(DEBUG_ERR,(__location__ " release_ip of IP %s is known to the kernel, "
+                                "but we have no interface assigned, has someone manually configured it? Ignore for now.\n",
                                 ctdb_addr_to_str(&vnn->public_address)));
-               ctdb_ban_self(ctdb);
-               return -1;
+               return 0;
        }
 
        DEBUG(DEBUG_NOTICE,("Release of IP %s/%u on interface %s  node:%d\n",