From a26d39e5cec6f41164cb26dad9641fdef1c67e20 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 20 Jun 2016 20:45:28 +1000 Subject: [PATCH] ctdb-recoverd: Drop code to change the IP assignment tree The tree is no longer used in verification. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/server/ctdb_recoverd.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 2d1b15da1bc..e5b94540fec 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -2510,28 +2510,6 @@ static void recd_node_rebalance_handler(uint64_t srvid, TDB_DATA data, -static void recd_update_ip_handler(uint64_t srvid, TDB_DATA data, - void *private_data) -{ - struct ctdb_recoverd *rec = talloc_get_type( - private_data, struct ctdb_recoverd); - struct ctdb_public_ip *ip; - - if (rec->recmaster != rec->ctdb->pnn) { - DEBUG(DEBUG_INFO,("Not recmaster, ignore update ip message\n")); - return; - } - - if (data.dsize != sizeof(struct ctdb_public_ip)) { - DEBUG(DEBUG_ERR,(__location__ " Incorrect size of recd update ip message. Was %zd but expected %zd bytes\n", data.dsize, sizeof(struct ctdb_public_ip))); - return; - } - - ip = (struct ctdb_public_ip *)data.dptr; - - update_ip_assignment_tree(rec->ctdb, ip); -} - static void srvid_disable_and_reply(struct ctdb_context *ctdb, TDB_DATA data, struct ctdb_op_state *op_state) @@ -2732,8 +2710,6 @@ static void election_handler(uint64_t srvid, TDB_DATA data, void *private_data) ctdb_recovery_unlock(rec); } - clear_ip_assignment_tree(ctdb); - /* ok, let that guy become recmaster then */ ret = ctdb_ctrl_setrecmaster(ctdb, CONTROL_TIMEOUT(), CTDB_CURRENT_NODE, em->pnn); @@ -3894,9 +3870,6 @@ static void monitor_cluster(struct ctdb_context *ctdb) /* register a message port for disabling the ip check for a short while */ ctdb_client_set_message_handler(ctdb, CTDB_SRVID_DISABLE_IP_CHECK, disable_ip_check_handler, rec); - /* register a message port for updating the recovery daemons node assignment for an ip */ - ctdb_client_set_message_handler(ctdb, CTDB_SRVID_RECD_UPDATE_IP, recd_update_ip_handler, rec); - /* register a message port for forcing a rebalance of a node next reallocation */ ctdb_client_set_message_handler(ctdb, CTDB_SRVID_REBALANCE_NODE, recd_node_rebalance_handler, rec); -- 2.47.3