From 91f99ddfb3ba1cfb98223863ac3a474a5fbe4ea1 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 31 Mar 2015 13:59:49 +1100 Subject: [PATCH] ctdb-recoverd: Remove redundant condition when checking recovery lock It isn't possible to hold the recovery lock without having a lock file set. This is part of a goal to generalise the recovery lock mechanism to just use a helper program, which may use a lock file or may use something else. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/server/ctdb_recoverd.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index e0eb7d60b66..e76a0d02b9c 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -2745,12 +2745,10 @@ static void election_handler(struct ctdb_context *ctdb, uint64_t srvid, /* we didn't win */ TALLOC_FREE(rec->send_election_te); - if (ctdb->recovery_lock_file != NULL) { - /* Release the recovery lock file */ - if (ctdb_recovery_have_lock(ctdb)) { - ctdb_recovery_unlock(ctdb); - unban_all_nodes(ctdb); - } + /* Release the recovery lock file */ + if (ctdb_recovery_have_lock(ctdb)) { + ctdb_recovery_unlock(ctdb); + unban_all_nodes(ctdb); } /* ok, let that guy become recmaster then */ -- 2.11.4.GIT