Revert "recoverd: Disable takeover runs on other nodes for 5 minutes"

5 minutes is too long to leave the cluster in limbo if the recovery
daemon dies during a takeover run, even though this is quite unlikely.
We need a new recover master to be able to do takeover runs fairly
quickly.

This reverts commit 71080676bb4acbd0d9b595a30cf7fe6dddbf426f.

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index d41932b6e3b4ce3d512ef3f2c2bea7a890a0e5eb..e5c2887f44f37a78cc7b88b1ba6be357b7d3dd80 100644 (file)
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -1691,10 +1691,10 @@ static bool do_takeover_run(struct ctdb_recoverd *rec,
 
        nodes = list_of_connected_nodes(rec->ctdb, nodemap, rec, false);
 
-       /* Disable for 5 minutes.  This can be a tunable later if
+       /* Disable for 60 seconds.  This can be a tunable later if
         * necessary.
         */
-       dtr.data = 300;
+       dtr.data = 60;
        for (i = 0; i < talloc_array_length(nodes); i++) {
                if (ctdb_client_send_message(rec->ctdb, nodes[i],
                                             CTDB_SRVID_DISABLE_TAKEOVER_RUNS,