From fa705bc7deedd632488a11df4572f43da2d0d7a2 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 20 Aug 2019 11:29:42 +1000 Subject: [PATCH] ctdb-daemon: Drop unused function ctdb_local_node_got_banned() BUG: https://bugzilla.samba.org/show_bug.cgi?id=14087 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs (cherry picked from commit 91ac4c13d8472955d1f04bd775ec4b3ff8bf1b61) --- ctdb/include/ctdb_private.h | 1 - ctdb/server/ctdb_banning.c | 24 ------------------------ 2 files changed, 25 deletions(-) diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 7b8121a2e13..0c66725d36c 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -481,7 +481,6 @@ int ctdb_ibw_init(struct ctdb_context *ctdb); /* from ctdb_banning.c */ -void ctdb_local_node_got_banned(struct ctdb_context *ctdb); int32_t ctdb_control_set_ban_state(struct ctdb_context *ctdb, TDB_DATA indata); int32_t ctdb_control_get_ban_state(struct ctdb_context *ctdb, TDB_DATA *outdata); void ctdb_ban_self(struct ctdb_context *ctdb); diff --git a/ctdb/server/ctdb_banning.c b/ctdb/server/ctdb_banning.c index 11794dc5b0b..3c711575e8c 100644 --- a/ctdb/server/ctdb_banning.c +++ b/ctdb/server/ctdb_banning.c @@ -57,30 +57,6 @@ static void ctdb_ban_node_event(struct tevent_context *ev, } } -void ctdb_local_node_got_banned(struct ctdb_context *ctdb) -{ - struct ctdb_db_context *ctdb_db; - - DEBUG(DEBUG_NOTICE, ("This node has been banned - releasing all public " - "IPs and setting the generation to INVALID.\n")); - - /* Reset the generation id to 1 to make us ignore any - REQ/REPLY CALL/DMASTER someone sends to us. - We are now banned so we shouldnt service database calls - anymore. - */ - ctdb->vnn_map->generation = INVALID_GENERATION; - for (ctdb_db = ctdb->db_list; ctdb_db != NULL; ctdb_db = ctdb_db->next) { - ctdb_db->generation = INVALID_GENERATION; - } - - /* Recovery daemon will set the recovery mode ACTIVE and freeze - * databases. - */ - - ctdb_release_all_ips(ctdb); -} - int32_t ctdb_control_set_ban_state(struct ctdb_context *ctdb, TDB_DATA indata) { struct ctdb_ban_state *bantime = (struct ctdb_ban_state *)indata.dptr; -- 2.47.2