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

ctdb-recoverd: Change update_flags_on_all_nodes() to take rec argument

Browse Source 
This makes fields such as recmaster and nodemap easily available if
required.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2020-05-05 23:45:15 +10:00 committed by Martin Schwenke
parent 6982fcb3e6
commit cb3a3147b7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ctdb/server/ctdb_recoverd.c
View File

@ -427,10 +427,11 @@ static int set_recovery_mode(struct ctdb_context *ctdb,
/*
* Update flags on all connected nodes
*/
static int update_flags_on_all_nodes(struct ctdb_context *ctdb,
static int update_flags_on_all_nodes(struct ctdb_recoverd *rec,
uint32_t pnn,
uint32_t flags)
{
struct ctdb_context *ctdb = rec->ctdb;
int ret;
ret = ctdb_ctrl_modflags(ctdb, CONTROL_TIMEOUT(), pnn, flags, ~flags);
@ -1127,7 +1128,7 @@ static int do_recovery(struct ctdb_recoverd *rec,
continue;
}
ret = update_flags_on_all_nodes(ctdb,
ret = update_flags_on_all_nodes(rec,
i,
nodemap->nodes[i].flags);
if (ret != 0) {
@ -2615,7 +2616,7 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
if (i == j) {
DEBUG(DEBUG_ERR,("Use flags 0x%02x from remote node %d for cluster update of its own flags\n", remote_nodemaps[j]->nodes[i].flags, j));
update_flags_on_all_nodes(
ctdb,
rec,
nodemap->nodes[i].pnn,
remote_nodemaps[j]->nodes[i].flags);
ctdb_set_culprit(rec, nodemap->nodes[j].pnn);
@ -2625,7 +2626,7 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
} else {
DEBUG(DEBUG_ERR,("Use flags 0x%02x from local recmaster node for cluster update of node %d flags\n", nodemap->nodes[i].flags, i));
update_flags_on_all_nodes(
ctdb,
rec,
nodemap->nodes[i].pnn,
nodemap->nodes[i].flags);
ctdb_set_culprit(rec, nodemap->nodes[j].pnn);