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

ctdb-recoverd: Use this_node_is_leader() in an extra context

Browse Source 
This is arguably clearer.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2021-12-09 11:47:54 +11:00 committed by Martin Schwenke
parent c8721d01c6
commit ff0140e470
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ctdb/server/ctdb_recoverd.c
View File

@ -856,7 +856,6 @@ static int helper_run(struct ctdb_recoverd *rec, TALLOC_CTX *mem_ctx,
struct tevent_fd *fde;
const char **args;
int nargs, ret;
uint32_t recmaster = rec->recmaster;
state = talloc_zero(mem_ctx, struct helper_state);
if (state == NULL) {
@ -918,8 +917,7 @@ static int helper_run(struct ctdb_recoverd *rec, TALLOC_CTX *mem_ctx,
while (!state->done) {
tevent_loop_once(rec->ctdb->ev);
/* If recmaster changes, we have lost election */
if (recmaster != rec->recmaster) {
if (!this_node_is_leader(rec)) {
D_ERR("Recmaster changed to %u, aborting %s\n",
rec->recmaster, type);
state->result = 1;