]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-recoverd: Only start election if node can be leader
authorMartin Schwenke <martin@meltin.net>
Fri, 7 Jan 2022 00:27:06 +0000 (11:27 +1100)
committerMartin Schwenke <martins@samba.org>
Mon, 17 Jan 2022 10:21:32 +0000 (10:21 +0000)
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/server/ctdb_recoverd.c

index affa3b2bbd1786a70e4e211c0cadb989b366598a..0b499e9e8c3c3b2edfdc4b14479116dadbcc8e33 100644 (file)
@@ -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)