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

ctdb-recoverd: Update the local node map before pushing out flags

Browse Source 
The resulting code structure looks a little weird.  However, there is
another condition that requires the flags to be pushed that will be
inserted before the continue statement in a subsequent commit..

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14784
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2021-07-11 21:28:43 +10:00 committed by Amitay Isaacs
parent 82a075d4d7
commit 620d078714
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ctdb/server/ctdb_recoverd.c
View File

@ -568,16 +568,6 @@ static int update_flags(struct ctdb_recoverd *rec,
remote_flags = remote_nodemap->nodes[j].flags;
if (local_flags != remote_flags) {
ret = update_flags_on_all_nodes(rec,
remote_pnn,
remote_flags);
if (ret != 0) {
DBG_ERR(
"Unable to update flags on remote nodes\n");
talloc_free(mem_ctx);
return -1;
}
/*
* Update the local copy of the flags in the
* recovery daemon.
@ -588,6 +578,21 @@ static int update_flags(struct ctdb_recoverd *rec,
remote_flags,
local_flags);
nodemap->nodes[j].flags = remote_flags;
local_flags = remote_flags;
goto push;
}
continue;
push:
D_NOTICE("Pushing updated flags for node %u (0x%x)\n",
remote_pnn,
local_flags);
ret = update_flags_on_all_nodes(rec, remote_pnn, local_flags);
if (ret != 0) {
DBG_ERR("Unable to update flags on remote nodes\n");
talloc_free(mem_ctx);
return -1;
}
}
talloc_free(mem_ctx);