recoverd: Clear IP flags after IP allocation algorithm has run

[kai/samba-autobuild/.git] / ctdb / server / ctdb_takeover.c

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 3ba7dc353e51c9e31931ec35c5e224126891cd2c..da9c4c93336d87dd006f9edd9917f3cecb5879c8 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -2281,6 +2281,17 @@ static uint32_t *get_tunable_from_nodes(struct ctdb_context *ctdb,
        return tvals;
 }
 
+static void clear_ipflags(struct ctdb_node_map *nodemap)
+{
+       int i;
+
+       for (i=0;i<nodemap->num;i++) {
+               nodemap->nodes[i].flags &=
+                       ~(NODE_FLAGS_NOIPTAKEOVER|NODE_FLAGS_NOIPHOST);
+       }
+}
+
+
 /* Set internal flags for IP allocation:
  *   Clear ip flags
  *   Set NOIPTAKOVER ip flags from per-node NoIPTakeover tunable
@@ -2296,11 +2307,7 @@ static void set_ipflags_internal(struct ctdb_node_map *nodemap,
 {
        int i;
 
-       /* Clear IP flags */
-       for (i=0;i<nodemap->num;i++) {
-               nodemap->nodes[i].flags &=
-                       ~(NODE_FLAGS_NOIPTAKEOVER|NODE_FLAGS_NOIPHOST);
-       }
+       clear_ipflags(nodemap);
 
        for (i=0;i<nodemap->num;i++) {
                /* Can not take IPs on node with NoIPTakeover set */
@@ -2400,6 +2407,11 @@ int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map *nodemap,
        /* Do the IP reassignment calculations */
        ctdb_takeover_run_core(ctdb, nodemap, &all_ips);
 
+       /* The IP flags need to be cleared because they should never
+        * be seen outside the IP allocation code.
+        */
+       clear_ipflags(nodemap);
+
        /* The recovery daemon does regular sanity checks of the IPs.
         * However, sometimes it is overzealous and thinks changes are
         * required when they're already underway.  This stops the