ctdb_control should use the provided timeout and not hardcode to 1.0

seconds

(This used to be ctdb commit 03acb2f450578f6195ab2d0a598f6720e33e7cfb)

diff --git a/ctdb/common/ctdb_client.c b/ctdb/common/ctdb_client.c
index c2916d24cbd8f5e188924218a0a511e4fe0c3d56..13c242b9fc6508a507617dc6554c802b971edb8b 100644 (file)
--- a/ctdb/common/ctdb_client.c
+++ b/ctdb/common/ctdb_client.c
@@ -710,7 +710,7 @@ int ctdb_control(struct ctdb_context *ctdb, uint32_t destnode, uint64_t srvid,
        /* semi-async operation */
        timed_out = 0;
        if (timeout) {
-               event_add_timed(ctdb->ev, mem_ctx, timeval_current_ofs(1, 0), timeout_func, &timed_out);
+               event_add_timed(ctdb->ev, mem_ctx, *timeout, timeout_func, &timed_out);
        }
        while ((state->state == CTDB_CALL_WAIT)
        &&      (timed_out == 0) ){