sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

ctdb-tests: Reimplement message handlers using srvid abstraction

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13042

This is required for CHECK_PID_SRVID control implementation.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2017-08-30 16:59:16 +10:00 committed by Martin Schwenke
parent 1c472dffd4
commit c480cc0152
1 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
ctdb/tests/src/fake_ctdbd.c
View File

@ -40,6 +40,7 @@
#include "common/system.h" #include "common/system.h"
#include "common/logging.h" #include "common/logging.h"
#include "common/tunable.h" #include "common/tunable.h"
#include "common/srvid.h"
#include "ipalloc_read_known_ips.h" #include "ipalloc_read_known_ips.h"
@ -95,12 +96,6 @@ struct database_map {
struct database *db; struct database *db;
}; };
struct srvid_register_state {
struct srvid_register_state *prev, *next;
struct ctdbd_context *ctdb;
uint64_t srvid;
};
struct fake_control_failure { struct fake_control_failure {
struct fake_control_failure *prev, *next; struct fake_control_failure *prev, *next;
enum ctdb_controls opcode; enum ctdb_controls opcode;
@ -121,7 +116,7 @@ struct ctdbd_context {
struct interface_map *iface_map; struct interface_map *iface_map;
struct vnn_map *vnn_map; struct vnn_map *vnn_map;
struct database_map *db_map; struct database_map *db_map;
struct srvid_register_state *rstate; struct srvid_context *srv;
int num_clients; int num_clients;
struct timeval start_time; struct timeval start_time;
struct timeval recovery_start_time; struct timeval recovery_start_time;
@ -898,6 +893,7 @@ static struct ctdbd_context *ctdbd_setup(TALLOC_CTX *mem_ctx)
struct ctdbd_context *ctdb; struct ctdbd_context *ctdb;
char line[1024]; char line[1024];
bool status; bool status;
int ret;
ctdb = talloc_zero(mem_ctx, struct ctdbd_context); ctdb = talloc_zero(mem_ctx, struct ctdbd_context);
if (ctdb == NULL) { if (ctdb == NULL) {
@ -924,6 +920,11 @@ static struct ctdbd_context *ctdbd_setup(TALLOC_CTX *mem_ctx)
goto fail; goto fail;
} }
ret = srvid_init(ctdb, &ctdb->srv);
if (ret != 0) {
goto fail;
}
while (fgets(line, sizeof(line), stdin) != NULL) { while (fgets(line, sizeof(line), stdin) != NULL) {
char *t; char *t;
@ -1590,10 +1591,9 @@ fail:
} }
static int srvid_register_state_destructor(struct srvid_register_state *rstate) static void srvid_handler(uint64_t srvid, TDB_DATA data, void *private_data)
{ {
DLIST_REMOVE(rstate->ctdb->rstate, rstate); printf("Received a message for SRVID 0x%"PRIx64"\n", srvid);
return 0;
} }
static void control_register_srvid(TALLOC_CTX *mem_ctx, static void control_register_srvid(TALLOC_CTX *mem_ctx,
@ -1605,24 +1605,19 @@ static void control_register_srvid(TALLOC_CTX *mem_ctx,
req, struct client_state); req, struct client_state);
struct ctdbd_context *ctdb = state->ctdb; struct ctdbd_context *ctdb = state->ctdb;
struct ctdb_reply_control reply; struct ctdb_reply_control reply;
struct srvid_register_state *rstate; int ret;
reply.rdata.opcode = request->opcode; reply.rdata.opcode = request->opcode;
rstate = talloc_zero(ctdb, struct srvid_register_state); ret = srvid_register(ctdb->srv, state, request->srvid,
if (rstate == NULL) { srvid_handler, state);
if (ret != 0) {
reply.status = -1; reply.status = -1;
reply.errmsg = "Memory error"; reply.errmsg = "Memory error";
goto fail; goto fail;
} }
rstate->ctdb = ctdb;
rstate->srvid = request->srvid;
talloc_set_destructor(rstate, srvid_register_state_destructor); DEBUG(DEBUG_INFO, ("Register srvid 0x%"PRIx64"\n", request->srvid));
DLIST_ADD_END(ctdb->rstate, rstate);
DEBUG(DEBUG_INFO, ("Register srvid 0x%"PRIx64"\n", rstate->srvid));
reply.status = 0; reply.status = 0;
reply.errmsg = NULL; reply.errmsg = NULL;
@ -1640,24 +1635,18 @@ static void control_deregister_srvid(TALLOC_CTX *mem_ctx,
req, struct client_state); req, struct client_state);
struct ctdbd_context *ctdb = state->ctdb; struct ctdbd_context *ctdb = state->ctdb;
struct ctdb_reply_control reply; struct ctdb_reply_control reply;
struct srvid_register_state *rstate = NULL; int ret;
reply.rdata.opcode = request->opcode; reply.rdata.opcode = request->opcode;
for (rstate = ctdb->rstate; rstate != NULL; rstate = rstate->next) { ret = srvid_deregister(ctdb->srv, request->srvid, state);
if (rstate->srvid == request->srvid) { if (ret != 0) {
break;
}
}
if (rstate == NULL) {
reply.status = -1; reply.status = -1;
reply.errmsg = "srvid not registered"; reply.errmsg = "srvid not registered";
goto fail; goto fail;
} }
DEBUG(DEBUG_INFO, ("Deregister srvid 0x%"PRIx64"\n", rstate->srvid)); DEBUG(DEBUG_INFO, ("Deregister srvid 0x%"PRIx64"\n", request->srvid));
talloc_free(rstate);
reply.status = 0; reply.status = 0;
reply.errmsg = NULL; reply.errmsg = NULL;
@ -1666,7 +1655,6 @@ static void control_deregister_srvid(TALLOC_CTX *mem_ctx,
return; return;
fail: fail:
TALLOC_FREE(rstate);
client_send_control(req, header, &reply); client_send_control(req, header, &reply);
} }