From: Martin Schwenke Date: Fri, 7 Jan 2022 00:27:06 +0000 (+1100) Subject: ctdb-recoverd: Only start election if node can be leader X-Git-Tag: tdb-1.4.6~131 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac5a3ca063fd7435557a65866fda5fa1e0012394;p=thirdparty%2Fsamba.git ctdb-recoverd: Only start election if node can be leader Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index affa3b2bbd1..0b499e9e8c3 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -722,10 +722,12 @@ static void lost_reclock_handler(void *private_data) struct ctdb_recoverd *rec = talloc_get_type_abort( private_data, struct ctdb_recoverd); - D_ERR("Recovery lock helper terminated, triggering an election\n"); + D_ERR("Recovery lock helper terminated\n"); TALLOC_FREE(rec->recovery_lock_handle); - force_election(rec); + if (this_node_can_be_leader(rec)) { + force_election(rec); + } } static bool ctdb_recovery_lock(struct ctdb_recoverd *rec)