ctdb-recoverd: Drop explicit check for recovery lock
authorMartin Schwenke <martin@meltin.net>
Tue, 27 Oct 2015 03:32:48 +0000 (14:32 +1100)
committerAmitay Isaacs <amitay@samba.org>
Mon, 16 Nov 2015 07:42:12 +0000 (08:42 +0100)
This is already handled in update_recovery_lock(), which is called
immediately before.

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

index d131c47fd7c2dc1b74194b192e1299cf9bc194e8..9ff73bdb2f564cb902c6e057a5b8190a3b62b7f4 100644 (file)
@@ -3388,13 +3388,6 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
                return;
        }
 
-       /* Make sure that if recovery lock verification becomes disabled when
-          we close the file
-       */
-        if (ctdb->recovery_lock_file == NULL) {
-               ctdb_recovery_unlock(ctdb);
-       }
-
        pnn = ctdb_get_pnn(ctdb);
 
        /* get the vnnmap */