diff options
author | Martin Schwenke <martin@meltin.net> | 2020-05-06 00:01:05 +1000 |
---|---|---|
committer | Martin Schwenke <martins@samba.org> | 2022-01-17 10:21:33 +0000 |
commit | a76374070d38e2dc86067ce413bb26b8e554c0b2 (patch) | |
tree | bdb3d03137aa03bdb56f2fdf7a5cf9c6aaac8a95 /ctdb | |
parent | 193b624d26acffaa39a5fc393268f152b5809f99 (diff) | |
download | samba-a76374070d38e2dc86067ce413bb26b8e554c0b2.tar.gz |
ctdb-daemon: Drop implementation of {GET,SET}_RECMASTER controls
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
-rw-r--r-- | ctdb/include/ctdb_private.h | 3 | ||||
-rw-r--r-- | ctdb/server/ctdb_control.c | 7 | ||||
-rw-r--r-- | ctdb/server/ctdb_recover.c | 25 | ||||
-rw-r--r-- | ctdb/server/ctdbd.c | 1 | ||||
-rw-r--r-- | ctdb/tests/src/fake_ctdbd.c | 21 |
5 files changed, 3 insertions, 54 deletions
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index b0469f7f14a..382c2388a9b 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -299,7 +299,6 @@ struct ctdb_context { struct ctdb_statistics statistics_history[MAX_STAT_HISTORY]; struct ctdb_vnn_map *vnn_map; uint32_t num_clients; - uint32_t recovery_master; struct ctdb_client_ip *client_ip_list; bool do_checkpublicip; bool do_setsched; @@ -825,8 +824,6 @@ int32_t ctdb_control_get_capabilities(struct ctdb_context *ctdb, TDB_DATA *outdata); int32_t ctdb_control_recd_ping(struct ctdb_context *ctdb); -int32_t ctdb_control_set_recmaster(struct ctdb_context *ctdb, - uint32_t opcode, TDB_DATA indata); void ctdb_node_become_inactive(struct ctdb_context *ctdb); diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c index 131ebd43afc..08268512bfa 100644 --- a/ctdb/server/ctdb_control.c +++ b/ctdb/server/ctdb_control.c @@ -332,12 +332,11 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb, return ctdb->recovery_mode; } - case CTDB_CONTROL_SET_RECMASTER: { - return ctdb_control_set_recmaster(ctdb, opcode, indata); - } + case CTDB_CONTROL_SET_RECMASTER: + return control_not_implemented("SET_RECMASTER", NULL); case CTDB_CONTROL_GET_RECMASTER: - return ctdb->recovery_master; + return control_not_implemented("GET_RECMASTER", NULL); case CTDB_CONTROL_GET_PID: return getpid(); diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index c59b4ad20ec..004ddb30efd 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -1179,31 +1179,6 @@ int32_t ctdb_control_recd_ping(struct ctdb_context *ctdb) return 0; } - - -int32_t ctdb_control_set_recmaster(struct ctdb_context *ctdb, uint32_t opcode, TDB_DATA indata) -{ - uint32_t new_recmaster; - - CHECK_CONTROL_DATA_SIZE(sizeof(uint32_t)); - new_recmaster = ((uint32_t *)(&indata.dptr[0]))[0]; - - if (ctdb->pnn != new_recmaster && ctdb->recovery_master == ctdb->pnn) { - DEBUG(DEBUG_ERR, - ("Remote node (%u) is now the recovery master\n", - new_recmaster)); - } - - if (ctdb->pnn == new_recmaster && ctdb->recovery_master != new_recmaster) { - DEBUG(DEBUG_ERR, - ("This node (%u) is now the recovery master\n", - ctdb->pnn)); - } - - ctdb->recovery_master = new_recmaster; - return 0; -} - void ctdb_node_become_inactive(struct ctdb_context *ctdb) { struct ctdb_db_context *ctdb_db; diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index c2dcf7d0606..72d811f1c8f 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -121,7 +121,6 @@ static struct ctdb_context *ctdb_init(struct tevent_context *ev) gettimeofday(&ctdb->last_recovery_finished, NULL); ctdb->recovery_mode = CTDB_RECOVERY_NORMAL; - ctdb->recovery_master = (uint32_t)-1; ctdb->upcalls = &ctdb_upcalls; diff --git a/ctdb/tests/src/fake_ctdbd.c b/ctdb/tests/src/fake_ctdbd.c index 9b269ca2fe4..4d5c41f3fd2 100644 --- a/ctdb/tests/src/fake_ctdbd.c +++ b/ctdb/tests/src/fake_ctdbd.c @@ -2173,23 +2173,6 @@ static void control_get_pid(TALLOC_CTX *mem_ctx, client_send_control(req, header, &reply); } -static void control_get_recmaster(TALLOC_CTX *mem_ctx, - struct tevent_req *req, - struct ctdb_req_header *header, - struct ctdb_req_control *request) -{ - struct client_state *state = tevent_req_data( - req, struct client_state); - struct ctdbd_context *ctdb = state->ctdb; - struct ctdb_reply_control reply; - - reply.rdata.opcode = request->opcode; - reply.status = ctdb->node_map->recmaster; - reply.errmsg = NULL; - - client_send_control(req, header, &reply); -} - static void control_get_pnn(TALLOC_CTX *mem_ctx, struct tevent_req *req, struct ctdb_req_header *header, @@ -4177,10 +4160,6 @@ static void client_process_control(struct tevent_req *req, control_get_pid(mem_ctx, req, &header, &request); break; - case CTDB_CONTROL_GET_RECMASTER: - control_get_recmaster(mem_ctx, req, &header, &request); - break; - case CTDB_CONTROL_GET_PNN: control_get_pnn(mem_ctx, req, &header, &request); break; |