remove the timeout parameter to ctdb_control_send() and

[sahlberg/ctdb.git] / libctdb / ctdb_client.c

diff --git a/libctdb/ctdb_client.c b/libctdb/ctdb_client.c
index c7ce13889d74f969b1011e367f2dc2fdf7482022..23faa4b5af86c56fd339dea7552009e54455cd8c 100644 (file)
--- a/libctdb/ctdb_client.c
+++ b/libctdb/ctdb_client.c
@@ -216,7 +216,7 @@ int ctdb_control_recv(struct ctdb_context *ctdb,
    called when a control completes or timesout to invoke the callback
    function the user provided
 */
-static void invoke_control_callback(struct event_context *ev, struct timed_event *te, 
+void ctdb_invoke_control_callback(struct event_context *ev, struct timed_event *te, 
        struct timeval t, void *private_data)
 {
        struct ctdb_client_control_state *state;
@@ -278,7 +278,7 @@ static void ctdb_client_reply_control(struct ctdb_context *ctdb,
           and call the callback.
        */
        if (state->async.fn) {
-               event_add_timed(ctdb->ev, state, timeval_zero(), invoke_control_callback, state);
+               event_add_timed(ctdb->ev, state, timeval_zero(), ctdb_invoke_control_callback, state);
        }
 }
 
@@ -436,32 +436,11 @@ static int ctdb_client_queue_pkt(struct ctdb_context *ctdb, struct ctdb_req_head
 }
 
 
-/* time out handler for ctdb_control */
-static void control_timeout_func(struct event_context *ev, struct timed_event *te, 
-       struct timeval t, void *private_data)
-{
-       struct ctdb_client_control_state *state = talloc_get_type(private_data, struct ctdb_client_control_state);
-
-       DEBUG(DEBUG_ERR,(__location__ " control timed out. reqid:%u opcode:%u "
-                        "dstnode:%u\n", state->reqid, state->c->opcode,
-                        state->c->hdr.destnode));
-
-       state->state = CTDB_CONTROL_TIMEOUT;
-
-       /* if we had a callback registered for this control, pull the response
-          and call the callback.
-       */
-       if (state->async.fn) {
-               event_add_timed(state->ctdb->ev, state, timeval_zero(), invoke_control_callback, state);
-       }
-}
-
 /* async version of send control request */
 struct ctdb_client_control_state *ctdb_control_send(struct ctdb_context *ctdb, 
                uint32_t destnode, uint64_t srvid, 
                uint32_t opcode, uint32_t flags, TDB_DATA data, 
                TALLOC_CTX *mem_ctx,
-               struct timeval *timeout,
                char **errormsg)
 {
        struct ctdb_client_control_state *state;
@@ -504,11 +483,6 @@ struct ctdb_client_control_state *ctdb_control_send(struct ctdb_context *ctdb,
                memcpy(&c->data[0], data.dptr, data.dsize);
        }
 
-       /* timeout */
-       if (timeout && !timeval_is_zero(timeout)) {
-               event_add_timed(ctdb->ev, state, *timeout, control_timeout_func, state);
-       }
-
        ret = ctdb_client_queue_pkt(ctdb, &(c->hdr));
        if (ret != 0) {
                talloc_free(state);