ctdb-recovery: Don't sync recovery lock across cluster

Support for updating the recovery lock is being removed because it
isn't possible to recover from failure.

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 cb5f8a34fd78a43fe38a3e1a252b30c02573e87d..3b38398a0fc7c8574a36056f068bdc6f72ad008d 100644 (file)
--- a/ctdb/server/ctdb_recoverd.c
+++ b/ctdb/server/ctdb_recoverd.c
@@ -1615,40 +1615,6 @@ static void ctdb_recovery_unlock(struct ctdb_context *ctdb)
        }
 }
 
-/* when we start a recovery, make sure all nodes use the same reclock file
-   setting
-*/
-static int sync_recovery_lock_file_across_cluster(struct ctdb_recoverd *rec)
-{
-       struct ctdb_context *ctdb = rec->ctdb;
-       TALLOC_CTX *tmp_ctx = talloc_new(NULL);
-       TDB_DATA data;
-       uint32_t *nodes;
-
-       if (ctdb->recovery_lock_file == NULL) {
-               data.dptr  = NULL;
-               data.dsize = 0;
-       } else {
-               data.dsize = strlen(ctdb->recovery_lock_file) + 1;
-               data.dptr  = (uint8_t *)ctdb->recovery_lock_file;
-       }
-
-       nodes = list_of_active_nodes(ctdb, rec->nodemap, tmp_ctx, true);
-       if (ctdb_client_async_control(ctdb, CTDB_CONTROL_SET_RECLOCK_FILE,
-                                       nodes, 0,
-                                       CONTROL_TIMEOUT(),
-                                       false, data,
-                                       NULL, NULL,
-                                       rec) != 0) {
-               DEBUG(DEBUG_ERR, (__location__ " Failed to sync reclock file settings\n"));
-               talloc_free(tmp_ctx);
-               return -1;
-       }
-
-       talloc_free(tmp_ctx);
-       return 0;
-}
-
 static void ban_misbehaving_nodes(struct ctdb_recoverd *rec, bool *self_ban)
 {
        struct ctdb_context *ctdb = rec->ctdb;
@@ -2151,11 +2117,6 @@ static int do_recovery(struct ctdb_recoverd *rec,
        DEBUG(DEBUG_NOTICE, (__location__ " Recovery - updated db priority for all databases\n"));
 
 
-       /* update all other nodes to use the same setting for reclock files
-          as the local recovery master.
-       */
-       sync_recovery_lock_file_across_cluster(rec);
-
        /* Retrieve capabilities from all connected nodes */
        ret = update_capabilities(rec, nodemap);
        if (ret!=0) {