ctdb-recoverd: Drop calls to ctdb_ctrl_setrecmaster()

Nothing fetches this value anymore.

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

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 96c05667bead6ea91202fc4e0f1d2e501d7cbec7..51c4693c97439894e749b95a08f9bced08ed5a1f 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -1474,7 +1474,6 @@ static bool ctdb_election_win(struct ctdb_recoverd *rec, struct election_message
  */
 static int send_election_request(struct ctdb_recoverd *rec)
 {
-       int ret;
        TDB_DATA election_data;
        struct election_message emsg;
        uint64_t srvid;
@@ -1488,17 +1487,7 @@ static int send_election_request(struct ctdb_recoverd *rec)
        election_data.dptr  = (unsigned char *)&emsg;
 
 
-       /* first we assume we will win the election and set 
-          recoverymaster to be ourself on the current node
-        */
-       ret = ctdb_ctrl_setrecmaster(ctdb,
-                                    CONTROL_TIMEOUT(),
-                                    CTDB_CURRENT_NODE,
-                                    rec->pnn);
-       if (ret != 0) {
-               DEBUG(DEBUG_ERR, (__location__ " failed to set recmaster\n"));
-               return -1;
-       }
+       /* Assume this node will win the election, set leader accordingly */
        rec->leader = rec->pnn;
 
        /* send an election message to all active nodes */
@@ -1797,7 +1786,6 @@ static void election_handler(uint64_t srvid, TDB_DATA data, void *private_data)
        struct ctdb_recoverd *rec = talloc_get_type(
                private_data, struct ctdb_recoverd);
        struct ctdb_context *ctdb = rec->ctdb;
-       int ret;
        struct election_message *em = (struct election_message *)data.dptr;
 
        /* Ignore election packets from ourself */
@@ -1838,18 +1826,11 @@ static void election_handler(uint64_t srvid, TDB_DATA data, void *private_data)
        }
 
        /* Set leader to the winner of this round */
-       ret = ctdb_ctrl_setrecmaster(ctdb, CONTROL_TIMEOUT(),
-                                    CTDB_CURRENT_NODE, em->pnn);
-       if (ret != 0) {
-               DEBUG(DEBUG_ERR, (__location__ " failed to set recmaster"));
-               return;
-       }
        rec->leader = em->pnn;
 
        return;
 }
 
-
 /*
   force the start of the election process
  */
@@ -2009,7 +1990,6 @@ static void leader_handler(uint64_t srvid, TDB_DATA data, void *private_data)
 {
        struct ctdb_recoverd *rec = talloc_get_type_abort(
                private_data, struct ctdb_recoverd);
-       struct ctdb_context *ctdb = rec->ctdb;
        uint32_t pnn;
        size_t npull;
        int ret;
@@ -2037,16 +2017,6 @@ static void leader_handler(uint64_t srvid, TDB_DATA data, void *private_data)
        }
 
        D_NOTICE("Received leader broadcast, leader=%"PRIu32"\n", pnn);
-
-       ret = ctdb_ctrl_setrecmaster(ctdb,
-                                    CONTROL_TIMEOUT(),
-                                    CTDB_CURRENT_NODE,
-                                    pnn);
-       if (ret != 0) {
-               DBG_WARNING("Failed to set leader\n");
-               goto done;
-       }
-
        rec->leader = pnn;
 
 done: