ctdb-recovery-helper: Get tunables first, so control timeout can be set

During the recovery process, the timeout value for sending all controls
is decided by RecoverTimeout tunable.  So in the recovery process,
first get the tunables, so the control timeout gets set correctly.

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

diff --git a/ctdb/server/ctdb_recovery_helper.c b/ctdb/server/ctdb_recovery_helper.c
index 8c2c9e46b6df8cdfd2c119f6b703492facc1eb1e..a8c30bbee934aecf17cd684766f53cdb7dced01d 100644 (file)
--- a/ctdb/server/ctdb_recovery_helper.c
+++ b/ctdb/server/ctdb_recovery_helper.c
@@ -34,7 +34,9 @@
 #include "protocol/protocol_api.h"
 #include "client/client.h"
 
-#define TIMEOUT()      timeval_current_ofs(10, 0)
+static int recover_timeout = 120;
+
+#define TIMEOUT()      timeval_current_ofs(recover_timeout, 0)
 
 static void LOG(const char *fmt, ...)
 {
@@ -1215,10 +1217,10 @@ static bool db_recovery_recv(struct tevent_req *req, int *count)
 /*
  * Run the parallel database recovery
  *
+ * - Get tunables
  * - Get nodemap
  * - Get vnnmap
  * - Get capabilities from all nodes
- * - Get tunables from all nodes
  * - Get dbmap
  * - Set RECOVERY_ACTIVE
  * - Send START_RECOVERY
@@ -1242,10 +1244,10 @@ struct recovery_state {
        struct ctdb_dbid_map *dbmap;
 };
 
+static void recovery_tunables_done(struct tevent_req *subreq);
 static void recovery_nodemap_done(struct tevent_req *subreq);
 static void recovery_vnnmap_done(struct tevent_req *subreq);
 static void recovery_capabilities_done(struct tevent_req *subreq);
-static void recovery_tunables_done(struct tevent_req *subreq);
 static void recovery_dbmap_done(struct tevent_req *subreq);
 static void recovery_active_done(struct tevent_req *subreq);
 static void recovery_start_recovery_done(struct tevent_req *subreq);
@@ -1273,17 +1275,59 @@ static struct tevent_req *recovery_send(TALLOC_CTX *mem_ctx,
        state->generation = generation;
        state->destnode = ctdb_client_pnn(client);
 
-       ctdb_req_control_get_nodemap(&request);
-       subreq = ctdb_client_control_send(mem_ctx, ev, client, state->destnode,
-                                         TIMEOUT(), &request);
+       ctdb_req_control_get_all_tunables(&request);
+       subreq = ctdb_client_control_send(state, state->ev, state->client,
+                                         state->destnode, TIMEOUT(),
+                                         &request);
        if (tevent_req_nomem(subreq, req)) {
                return tevent_req_post(req, ev);
        }
-       tevent_req_set_callback(subreq, recovery_nodemap_done, req);
+       tevent_req_set_callback(subreq, recovery_tunables_done, req);
 
        return req;
 }
 
+static void recovery_tunables_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct recovery_state *state = tevent_req_data(
+               req, struct recovery_state);
+       struct ctdb_reply_control *reply;
+       struct ctdb_req_control request;
+       int ret;
+       bool status;
+
+       status = ctdb_client_control_recv(subreq, &ret, state, &reply);
+       TALLOC_FREE(subreq);
+       if (! status) {
+               LOG("control GET_ALL_TUNABLES failed, ret=%d\n", ret);
+               tevent_req_error(req, ret);
+               return;
+       }
+
+       ret = ctdb_reply_control_get_all_tunables(reply, state,
+                                                 &state->tun_list);
+       if (ret != 0) {
+               LOG("control GET_ALL_TUNABLES failed, ret=%d\n", ret);
+               tevent_req_error(req, EPROTO);
+               return;
+       }
+
+       talloc_free(reply);
+
+       recover_timeout = state->tun_list->recover_timeout;
+
+       ctdb_req_control_get_nodemap(&request);
+       subreq = ctdb_client_control_send(state, state->ev, state->client,
+                                         state->destnode, TIMEOUT(),
+                                         &request);
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       tevent_req_set_callback(subreq, recovery_nodemap_done, req);
+}
+
 static void recovery_nodemap_done(struct tevent_req *subreq)
 {
        struct tevent_req *req = tevent_req_callback_data(
@@ -1420,45 +1464,6 @@ static void recovery_capabilities_done(struct tevent_req *subreq)
 
        talloc_free(reply);
 
-       ctdb_req_control_get_all_tunables(&request);
-       subreq = ctdb_client_control_send(state, state->ev, state->client,
-                                         state->destnode, TIMEOUT(),
-                                         &request);
-       if (tevent_req_nomem(subreq, req)) {
-               return;
-       }
-       tevent_req_set_callback(subreq, recovery_tunables_done, req);
-}
-
-static void recovery_tunables_done(struct tevent_req *subreq)
-{
-       struct tevent_req *req = tevent_req_callback_data(
-               subreq, struct tevent_req);
-       struct recovery_state *state = tevent_req_data(
-               req, struct recovery_state);
-       struct ctdb_reply_control *reply;
-       struct ctdb_req_control request;
-       int ret;
-       bool status;
-
-       status = ctdb_client_control_recv(subreq, &ret, state, &reply);
-       TALLOC_FREE(subreq);
-       if (! status) {
-               LOG("control GET_ALL_TUNABLES failed, ret=%d\n", ret);
-               tevent_req_error(req, ret);
-               return;
-       }
-
-       ret = ctdb_reply_control_get_all_tunables(reply, state,
-                                                 &state->tun_list);
-       if (ret != 0) {
-               LOG("control GET_ALL_TUNABLES failed, ret=%d\n", ret);
-               tevent_req_error(req, EPROTO);
-               return;
-       }
-
-       talloc_free(reply);
-
        ctdb_req_control_get_dbmap(&request);
        subreq = ctdb_client_control_send(state, state->ev, state->client,
                                          state->destnode, TIMEOUT(),