ctdb-recoverd: Rename update_local_flags() -> update_flags()

This also updates remote flags so the name is misleading.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14466
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 4aa8e72d60e92951b35190d2ffcfdb1bfb756609)

Autobuild-User(v4-11-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-11-test): Tue Aug 25 15:13:03 UTC 2020 on sn-devel-184

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 4b472fa8897a57542276c4f0dce49deb10555219..7c53335604abd37d9b0a625b136555a46d49f5f5 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -541,9 +541,9 @@ static void ctdb_wait_election(struct ctdb_recoverd *rec)
  * flags changes to all nodes.  This is only run by the recovery
  * master.
  */
-static int update_local_flags(struct ctdb_recoverd *rec,
-                             struct ctdb_node_map_old *nodemap,
-                             struct ctdb_node_map_old **remote_nodemaps)
+static int update_flags(struct ctdb_recoverd *rec,
+                       struct ctdb_node_map_old *nodemap,
+                       struct ctdb_node_map_old **remote_nodemaps)
 {
        unsigned int j;
        struct ctdb_context *ctdb = rec->ctdb;
@@ -2554,10 +2554,10 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
                return;
        }
 
-       /* ensure our local copies of flags are right */
-       ret = update_local_flags(rec, nodemap, remote_nodemaps);
+       /* Ensure our local and remote flags are correct */
+       ret = update_flags(rec, nodemap, remote_nodemaps);
        if (ret != 0) {
-               DEBUG(DEBUG_ERR,("Unable to update local flags\n"));
+               D_ERR("Unable to update flags\n");
                return;
        }