ctdb-ipalloc: Do ipreallocated even if no IP addresses can be allocated
authorMartin Schwenke <martin@meltin.net>
Wed, 20 Apr 2016 10:17:04 +0000 (20:17 +1000)
committerAmitay Isaacs <amitay@samba.org>
Mon, 25 Apr 2016 05:10:14 +0000 (07:10 +0200)
In particular, LVS won't work at all if there are no public IP
addresses.

This is a temporary solution until a generic reconfiguration hook is
implemented.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/server/ctdb_takeover.c

index 0caf55bff339d9e5f1c780e789c97f063ca3ba19..5001489ef180e3b6e93dc92ef641e9b9a26086c3 100644 (file)
@@ -1731,7 +1731,7 @@ int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map_old *nodem
        }
        if (!can_host_ips) {
                DEBUG(DEBUG_WARNING,("No nodes available to host public IPs yet\n"));
-               return 0;
+               goto ipreallocated;
        }
 
        /* since nodes only know about those public addresses that