sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

ctdb-recoverd: Add an intermediate state struct for nodemap fetching

Browse Source 
This will allow an error callback to be added.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14466
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-01-18 19:52:22 +11:00 committed by Amitay Isaacs
parent 2eaa0af616
commit a079ee3169
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ctdb/server/ctdb_recoverd.c
View File

@ -2223,13 +2223,19 @@ done:
} }
struct remote_nodemaps_state {
struct ctdb_node_map_old **remote_nodemaps;
};
static void async_getnodemap_callback(struct ctdb_context *ctdb, static void async_getnodemap_callback(struct ctdb_context *ctdb,
uint32_t node_pnn, uint32_t node_pnn,
int32_t res, int32_t res,
TDB_DATA outdata, TDB_DATA outdata,
void *callback_data) void *callback_data)
{ {
struct ctdb_node_map_old **remote_nodemaps = callback_data; struct remote_nodemaps_state *state =
(struct remote_nodemaps_state *)callback_data;
struct ctdb_node_map_old **remote_nodemaps = state->remote_nodemaps;
if (node_pnn >= ctdb->num_nodes) { if (node_pnn >= ctdb->num_nodes) {
DBG_ERR("Invalid PNN\n"); DBG_ERR("Invalid PNN\n");
@ -2248,6 +2254,7 @@ static int get_remote_nodemaps(struct ctdb_recoverd *rec,
struct ctdb_context *ctdb = rec->ctdb; struct ctdb_context *ctdb = rec->ctdb;
struct ctdb_node_map_old **t; struct ctdb_node_map_old **t;
uint32_t *nodes; uint32_t *nodes;
struct remote_nodemaps_state state;
int ret; int ret;
t = talloc_zero_array(mem_ctx, t = talloc_zero_array(mem_ctx,
@ -2260,6 +2267,8 @@ static int get_remote_nodemaps(struct ctdb_recoverd *rec,
nodes = list_of_active_nodes(ctdb, rec->nodemap, mem_ctx, true); nodes = list_of_active_nodes(ctdb, rec->nodemap, mem_ctx, true);
state.remote_nodemaps = t;
ret = ctdb_client_async_control(ctdb, ret = ctdb_client_async_control(ctdb,
CTDB_CONTROL_GET_NODEMAP, CTDB_CONTROL_GET_NODEMAP,
nodes, nodes,
@ -2269,7 +2278,7 @@ static int get_remote_nodemaps(struct ctdb_recoverd *rec,
tdb_null, tdb_null,
async_getnodemap_callback, async_getnodemap_callback,
NULL, NULL,
t); &state);
talloc_free(nodes); talloc_free(nodes);
if (ret != 0) { if (ret != 0) {