ctdb-tools: Drop the recovery from "reloadnodes"
authorMartin Schwenke <martin@meltin.net>
Wed, 4 Feb 2015 01:06:56 +0000 (12:06 +1100)
committerAmitay Isaacs <amitay@samba.org>
Tue, 7 Apr 2015 05:43:13 +0000 (07:43 +0200)
A recovery is not required: when deleting a node it should already be
disconnected and when adding a node it will also be disconnected.  The
new sanity checks in "reloadnodes" ensure that these assumptions are
met.

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

index c1014956b212b38e68e150dc735d5b451179d8a3..e7f166dbb454175511f1a7d7ef2f2c59bfd42b53 100644 (file)
@@ -6419,9 +6419,6 @@ static int control_reload_nodes_file(struct ctdb_context *ctdb, int argc, const
        srvid_broadcast(ctdb, CTDB_SRVID_DISABLE_RECOVERIES, &timeout,
                        "Enable recoveries", true);
 
-       /* initiate a recovery */
-       control_recover(ctdb, argc, argv);
-
        talloc_free(tmp_ctx);
 
        return 0;