projects
/
fio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
99b9a85
)
client: defer local trigger execute until after state is received
author
Jens Axboe
<axboe@fb.com>
Wed, 19 Nov 2014 16:09:01 +0000
(09:09 -0700)
committer
Jens Axboe
<axboe@fb.com>
Wed, 19 Nov 2014 16:09:01 +0000
(09:09 -0700)
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>
backend.c
patch
|
blob
|
blame
|
history
client.c
patch
|
blob
|
blame
|
history
diff --git
a/backend.c
b/backend.c
index 9bb017451f6bad52c62dbba069d8184ee9e6dde9..3c2697dec3edb71740cf51d3eddd9cd7fe7b2828 100644
(file)
--- 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 52440f067aed33cd9b03876a385e0ebe0ca1b7e6..2c10c037602353da6e52541d0eed6874b0921176 100644
(file)
--- 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: {