diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-10-24 11:13:16 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-10-29 17:14:55 +1100 |
| commit | f88cf2d013d6a7d5f5410fef27da2d1bd52cb1ee (patch) | |
| tree | 92eb2099159758622c218b2e5f2b22ad83be626c /ctdb/server | |
| parent | e8de58abd7fe7bec7752c6e33ea3e366d3c31a9d (diff) | |
| download | samba-f88cf2d013d6a7d5f5410fef27da2d1bd52cb1ee.tar.gz | |
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.
(This used to be ctdb commit 3e41170c78fc7a2bf526129c9b7db3739b61c6bf)
Diffstat (limited to 'ctdb/server')
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index d41932b6e3b..e5c2887f44f 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/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, |