sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

ctdb-client: Move ctdb_ctrl_modflags() to ctdb tool

Browse Source 
This function is only required by the tool.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2017-04-19 11:46:48 +10:00 committed by Martin Schwenke
parent 8e3ed87cac
commit be0a8d6c5f
3 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ctdb/client/client.h
View File

@ -833,11 +833,6 @@ int list_of_connected_nodes(struct ctdb_node_map *nodemap,
uint32_t exclude_pnn,
TALLOC_CTX *mem_ctx, uint32_t **pnn_list);
int ctdb_ctrl_modflags(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
struct ctdb_client_context *client,
uint32_t destnode, struct timeval timeout,
uint32_t set, uint32_t clear);
struct ctdb_server_id ctdb_client_get_server_id(
struct ctdb_client_context *client,
uint32_t task_id);

34
ctdb/client/client_util.c
View File

@ -78,40 +78,6 @@ int list_of_connected_nodes(struct ctdb_node_map *nodemap,
mem_ctx, pnn_list);
}
int ctdb_ctrl_modflags(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
struct ctdb_client_context *client,
uint32_t destnode, struct timeval timeout,
uint32_t set, uint32_t clear)
{
struct ctdb_node_map *nodemap;
struct ctdb_node_flag_change flag_change;
struct ctdb_req_control request;
uint32_t *pnn_list;
int ret, count;
ret = ctdb_ctrl_get_nodemap(mem_ctx, ev, client, destnode,
tevent_timeval_zero(), &nodemap);
if (ret != 0) {
return ret;
}
flag_change.pnn = destnode;
flag_change.old_flags = nodemap->node[destnode].flags;
flag_change.new_flags = flag_change.old_flags | set;
flag_change.new_flags &= ~clear;
count = list_of_connected_nodes(nodemap, -1, mem_ctx, &pnn_list);
if (count == -1) {
return ENOMEM;
}
ctdb_req_control_modify_flags(&request, &flag_change);
ret = ctdb_client_control_multi(mem_ctx, ev, client, pnn_list, count,
tevent_timeval_zero(), &request,
NULL, NULL);
return ret;
}
struct ctdb_server_id ctdb_client_get_server_id(
struct ctdb_client_context *client,
uint32_t task_id)

34
ctdb/tools/ctdb.c
View File

@ -2579,6 +2579,40 @@ static void wait_for_flags(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
}
}
static int ctdb_ctrl_modflags(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
struct ctdb_client_context *client,
uint32_t destnode, struct timeval timeout,
uint32_t set, uint32_t clear)
{
struct ctdb_node_map *nodemap;
struct ctdb_node_flag_change flag_change;
struct ctdb_req_control request;
uint32_t *pnn_list;
int ret, count;
ret = ctdb_ctrl_get_nodemap(mem_ctx, ev, client, destnode,
tevent_timeval_zero(), &nodemap);
if (ret != 0) {
return ret;
}
flag_change.pnn = destnode;
flag_change.old_flags = nodemap->node[destnode].flags;
flag_change.new_flags = flag_change.old_flags | set;
flag_change.new_flags &= ~clear;
count = list_of_connected_nodes(nodemap, -1, mem_ctx, &pnn_list);
if (count == -1) {
return ENOMEM;
}
ctdb_req_control_modify_flags(&request, &flag_change);
ret = ctdb_client_control_multi(mem_ctx, ev, client, pnn_list, count,
tevent_timeval_zero(), &request,
NULL, NULL);
return ret;
}
struct ipreallocate_state {
int status;
bool done;