force an update of the flags from the recmaster after each monitoring run

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index d0763440fcbaf2a4822943d8c49c5d87355d0148..3f0f264d412c38314dd6078276b5d3bf0d6b0699 100644 (file)
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -2523,7 +2523,6 @@ again:
                update_our_flags_on_all_nodes(ctdb, pnn, nodemap);
        }
 
-
        /* verify that the public ip address allocation is consistent */
        ret = ctdb_ctrl_get_public_ips(ctdb, CONTROL_TIMEOUT(), CTDB_CURRENT_NODE, mem_ctx, &ips);
        if (ret != 0) {
@@ -2835,6 +2834,17 @@ again:
 #endif
        }
 
+
+       DEBUG(DEBUG_ERR, (__location__ " Unable flags on all nodes\n"));
+       /*
+         update all nodes to have the same flags that we have
+        */
+       ret = update_flags_on_all_nodes(ctdb, nodemap);
+       if (ret != 0) {
+               DEBUG(DEBUG_ERR, (__location__ " Unable to update flags on all nodes\n"));
+               return -1;
+       }
+
        goto again;
 
 }