ctdb-recoverd: Add and use function cluster_lock_enabled()

Now all references to ctdb->recovery_lock are encapsulated in the
cluster lock code.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c
index 285b398084e495e90b98c68d88e62c985255b74a..f7572bfa5c93607078ef835769f985b72104574d 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -509,12 +509,17 @@ static int update_flags_on_all_nodes(struct ctdb_recoverd *rec,
 static bool _cluster_lock_lock(struct ctdb_recoverd *rec);
 static bool cluster_lock_held(struct ctdb_recoverd *rec);
 
+static bool cluster_lock_enabled(struct ctdb_recoverd *rec)
+{
+       return rec->ctdb->recovery_lock != NULL;
+}
+
 static bool cluster_lock_take(struct ctdb_recoverd *rec)
 {
        struct ctdb_context *ctdb = rec->ctdb;
        bool have_lock;
 
-       if (ctdb->recovery_lock == NULL) {
+       if (!cluster_lock_enabled(rec)) {
                return true;
        }
 
@@ -595,8 +600,7 @@ static void leader_broadcast_loop_handler(struct tevent_context *ev,
                if (this_node_is_leader(rec)) {
                        rec->leader = CTDB_UNKNOWN_PNN;
                }
-               if (rec->ctdb->recovery_lock != NULL &&
-                   cluster_lock_held(rec)) {
+               if (cluster_lock_enabled(rec) && cluster_lock_held(rec)) {
                        cluster_lock_release(rec);
                }
                goto done;
@@ -1282,7 +1286,7 @@ static int do_recovery(struct ctdb_recoverd *rec, TALLOC_CTX *mem_ctx)
                goto fail;
        }
 
-       if (ctdb->recovery_lock != NULL) {
+       if (cluster_lock_enabled(rec)) {
                bool ok;
 
                ok = cluster_lock_take(rec);
@@ -2760,8 +2764,7 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
                break;
        }
 
-
-        if (ctdb->recovery_lock != NULL) {
+       if (cluster_lock_enabled(rec)) {
                /* We must already hold the cluster lock */
                if (!cluster_lock_held(rec)) {
                        D_ERR("Failed cluster lock sanity check\n");
@@ -3111,7 +3114,7 @@ static void monitor_cluster(struct ctdb_context *ctdb)
                exit(1);
        }
 
-       if (ctdb->recovery_lock == NULL) {
+       if (!cluster_lock_enabled(rec)) {
                struct tevent_timer *tt;
 
                tt = tevent_add_timer(ctdb->ev,