fix a bug where the public ip addresses of the cluster would not be redistributed...

Remove a bogus check inside the recovery daemon that ONLY redistributed public addresses IFF the local node had/served public addresses.
This was a valid optimization long ago when we enforced that all nodes must use the same public addresses file   but is invalid today where we can have different public addresses configs on all nodes  and even have some nodes that do NOT use public addresses at all.

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index a40dfbb62f3cd7bb8619fd1980e5598b7834c4c8..95dd94f4b68f2edafc0c99e43f7b0751c84d7424 100644 (file)
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -1452,18 +1452,14 @@ static int do_recovery(struct ctdb_recoverd *rec,
        DEBUG(DEBUG_NOTICE, (__location__ " Recovery - updated flags\n"));
 
        /*
-         if enabled, tell nodes to takeover their public IPs
+         tell nodes to takeover their public IPs
         */
-       if (ctdb->vnn) {
-               rec->need_takeover_run = false;
-               ret = ctdb_takeover_run(ctdb, nodemap);
-               if (ret != 0) {
-                       DEBUG(DEBUG_ERR, (__location__ " Unable to setup public takeover addresses\n"));
-                       return -1;
-               }
-               DEBUG(DEBUG_INFO, (__location__ " Recovery - done takeover\n"));
+       rec->need_takeover_run = false;
+       ret = ctdb_takeover_run(ctdb, nodemap);
+       if (ret != 0) {
+               DEBUG(DEBUG_ERR, (__location__ " Unable to setup public takeover addresses\n"));
+               return -1;
        }
-
        DEBUG(DEBUG_NOTICE, (__location__ " Recovery - takeip finished\n"));
 
        /* execute the "recovered" event script on all nodes */