From: Jens Axboe <axboe@fb.com>
Date: Wed, 19 Nov 2014 16:09:01 +0000 (-0700)
Subject: client: defer local trigger execute until after state is received
X-Git-Tag: fio-2.2.0~53
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=13c702188833e778c6461c3c8d64be1d159f16ee;ds=inline

client: defer local trigger execute until after state is received

Don't run it immediately, we have to wait until we receive the
data from the server.

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/backend.c b/backend.c
index 9bb01745..3c2697de 100644
--- a/backend.c
+++ b/backend.c
@@ -1807,8 +1807,6 @@ void check_trigger_file(void)
 		if (nr_clients) {
 			if (trigger_remote_cmd)
 				fio_clients_send_trigger(trigger_remote_cmd);
-			if (trigger_cmd)
-				exec_trigger(trigger_cmd);
 		} else {
 			verify_save_state();
 			fio_terminate_threads(TERMINATE_ALL);
diff --git a/client.c b/client.c
index 52440f06..2c10c037 100644
--- a/client.c
+++ b/client.c
@@ -1485,6 +1485,7 @@ int fio_handle_client(struct fio_client *client)
 		char buf[64];
 
 		__verify_save_state(pdu, server_name(client, buf, sizeof(buf)));
+		exec_trigger(trigger_cmd);
 		break;
 		}
 	case FIO_NET_CMD_SENDFILE: {