client: ignore a client timeout, if the last thing we saw as a trigger

[fio.git] / client.c

diff --git a/client.c b/client.c
index 4209945245ff5e7c3cf4ea77f4d175a8d8d4dc8f..5466265310a70b593fcd1b90c9e9dba9cb5b97d4 100644 (file)
--- a/client.c
+++ b/client.c
@@ -942,6 +942,8 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
        dst->kb_base            = le32_to_cpu(src->kb_base);
        dst->unit_base          = le32_to_cpu(src->unit_base);
 
+       dst->sig_figs           = le32_to_cpu(src->sig_figs);
+
        dst->latency_depth      = le32_to_cpu(src->latency_depth);
        dst->latency_target     = le64_to_cpu(src->latency_target);
        dst->latency_window     = le64_to_cpu(src->latency_window);
@@ -982,6 +984,7 @@ static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
 
        dst->kb_base    = le32_to_cpu(src->kb_base);
        dst->unit_base  = le32_to_cpu(src->unit_base);
+       dst->sig_figs   = le32_to_cpu(src->sig_figs);
        dst->groupid    = le32_to_cpu(src->groupid);
        dst->unified_rw_rep     = le32_to_cpu(src->unified_rw_rep);
 }
@@ -1167,6 +1170,7 @@ static void convert_jobs_eta(struct jobs_eta *je)
        je->nr_threads          = le32_to_cpu(je->nr_threads);
        je->is_pow2             = le32_to_cpu(je->is_pow2);
        je->unit_base           = le32_to_cpu(je->unit_base);
+       je->sig_figs            = le32_to_cpu(je->sig_figs);
 }
 
 void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je)
@@ -1382,7 +1386,7 @@ static int fio_client_handle_iolog(struct fio_client *client,
        }
 
 out:
-       if (pdu && pdu != cmd->payload)
+       if (pdu && pdu != (void *) cmd->payload)
                free(pdu);
 
        if (log_pathname)
@@ -1662,6 +1666,8 @@ int fio_handle_client(struct fio_client *client)
        dprint(FD_NET, "client: got cmd op %s from %s (pdu=%u)\n",
                fio_server_op(cmd->opcode), client->hostname, cmd->pdu_len);
 
+       client->last_cmd = cmd->opcode;
+
        switch (cmd->opcode) {
        case FIO_NET_CMD_QUIT:
                if (ops->quit)
@@ -1936,7 +1942,10 @@ static int fio_check_clients_timed_out(void)
                else
                        log_err("fio: client %s timed out\n", client->hostname);
 
-               client->error = ETIMEDOUT;
+               if (client->last_cmd != FIO_NET_CMD_VTRIGGER)
+                       client->error = ETIMEDOUT;
+               else
+                       log_info("fio: ignoring timeout due to vtrigger\n");
                remove_client(client);
                ret = 1;
        }