sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

ctdb: let "moveip" end with CTDB_CONTROL_IPREALLOCATED to all connected nodes

Browse Source 
This matches the behavior of takeover_send/recv() from
ctdb_takeover_helper.c.

It means we consistently call the ipreallocated event scripts
and also send CTDB_SRVID_IPREALLOCATED after moving ips.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Stefan Metzmacher 2023-11-24 10:53:44 +01:00
parent 2c6b455bd7
commit 589ebabc95
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ctdb/tools/ctdb.c
View File

@ -87,6 +87,10 @@ static int disable_takeover_runs(TALLOC_CTX *mem_ctx,
uint32_t timeout,
uint32_t *pnn_list,
int count);
static int send_ipreallocated_control_to_nodes(TALLOC_CTX *mem_ctx,
struct ctdb_context *ctdb,
uint32_t *pnn_list,
int count);
/*
* Utility Functions
@ -3947,7 +3951,10 @@ static int moveip(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
return ret;
}
return 0;
return send_ipreallocated_control_to_nodes(mem_ctx,
ctdb,
connected_pnn,
connected_count);
}
static int control_moveip(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
@ -5957,6 +5964,32 @@ fail:
return ret;
}
static int send_ipreallocated_control_to_nodes(TALLOC_CTX *mem_ctx,
struct ctdb_context *ctdb,
uint32_t *pnn_list,
int count)
{
struct ctdb_req_control request;
int ret;
ctdb_req_control_ipreallocated(&request);
ret = ctdb_client_control_multi(mem_ctx,
ctdb->ev,
ctdb->client,
pnn_list,
count,
TIMEOUT(),
&request,
NULL, /* perr_list */
NULL); /* preply */
if (ret != 0) {
fprintf(stderr, "Failed to send ipreallocated\n");
return ret;
}
return 0;
}
static int control_reloadips(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
int argc, const char **argv)
{