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-recoverd: Simplify some stopped/banned checks to inactive checks

Browse Source 
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2020-03-17 17:10:20 +11:00 committed by Martin Schwenke
parent 358c59f51a
commit 958746f947
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ctdb/server/ctdb_recoverd.c
View File

@ -1452,13 +1452,8 @@ static bool ctdb_election_win(struct ctdb_recoverd *rec, struct election_message
return false;
}
/* we will automatically win if the other node is banned */
if (em->node_flags & NODE_FLAGS_BANNED) {
return true;
}
/* we will automatically win if the other node is banned */
if (em->node_flags & NODE_FLAGS_STOPPED) {
/* Automatically win if other node is banned or stopped */
if (em->node_flags & NODE_FLAGS_INACTIVE) {
return true;
}
@ -2630,7 +2625,7 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
/* if the local daemon is STOPPED or BANNED, we verify that the databases are
also frozen and that the recmode is set to active.
*/
if (rec->node_flags & (NODE_FLAGS_STOPPED | NODE_FLAGS_BANNED)) {
if (rec->node_flags & NODE_FLAGS_INACTIVE) {
/* If this node has become inactive then we want to
* reduce the chances of it taking over the leader
* role when it becomes active again. This