|
 |
0d5f07 |
From 640150c1b2c3cdbdd8baa5f1f3e7214a5c9a6533 Mon Sep 17 00:00:00 2001
|
|
|
0d5f07 |
From: Vincent Fu <vincent.fu@wdc.com>
|
|
|
0d5f07 |
Date: Tue, 31 Mar 2020 07:26:16 -0400
|
|
|
0d5f07 |
Subject: [PATCH] stat: eliminate extra log samples
|
|
|
0d5f07 |
|
|
|
0d5f07 |
b2a432bfbb6d inadvertently added extra log samples.
|
|
|
0d5f07 |
|
|
|
0d5f07 |
$ ./fio-canonical/fio --name=test --time_based --runtime=10s --write_lat_log=fio-07-b2a432 --log_avg_msec=1000 --size=1G --rw=rw
|
|
|
0d5f07 |
test: (g=0): rw=rw, bs=(R) 4096B-4096B, (W) 4096B-4096B, (T) 4096B-4096B, ioengine=psync, iodepth=1
|
|
|
0d5f07 |
fio-3.17-93-gb2a4
|
|
|
0d5f07 |
Starting 1 process
|
|
|
0d5f07 |
...
|
|
|
0d5f07 |
$ cat fio-07-b2a432_clat.1.log
|
|
|
0d5f07 |
1000, 5851, 0, 0, 0
|
|
|
0d5f07 |
1000, 2551, 1, 0, 0
|
|
|
0d5f07 |
1000, 5028, 1, 0, 0
|
|
|
0d5f07 |
2000, 4175, 0, 0, 0
|
|
|
0d5f07 |
2000, 3214, 1, 0, 0
|
|
|
0d5f07 |
2000, 60619, 0, 0, 0
|
|
|
0d5f07 |
...
|
|
|
0d5f07 |
|
|
|
0d5f07 |
There should only be two lines at each timestamp (one for reads, one for
|
|
|
0d5f07 |
writes), but the first two timestamps have three lines each.
|
|
|
0d5f07 |
|
|
|
0d5f07 |
The cause is an inadvertent change in stat.c:add_log_sample() of
|
|
|
0d5f07 |
__add_stat_to_log to _add_stat_to_log. Reverting to the two-underscore
|
|
|
0d5f07 |
version resolves this issue.
|
|
|
0d5f07 |
|
|
|
0d5f07 |
Fixes: https://github.com/axboe/fio/issues/947
|
|
|
0d5f07 |
Fixes: b2a432bfbb6d ("Per-command priority: Priority logging and libaio/io_uring cmdprio_percentage")
|
|
|
0d5f07 |
Signed-off-by: Vincent Fu <vincent.fu@wdc.com>
|
|
|
0d5f07 |
---
|
|
|
0d5f07 |
stat.c | 2 +-
|
|
|
0d5f07 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
0d5f07 |
|
|
|
0d5f07 |
diff --git a/stat.c b/stat.c
|
|
|
0d5f07 |
index d8c01d14..efa811d2 100644
|
|
|
0d5f07 |
--- a/stat.c
|
|
|
0d5f07 |
+++ b/stat.c
|
|
|
0d5f07 |
@@ -2749,7 +2749,7 @@ static unsigned long add_log_sample(struct thread_data *td,
|
|
|
0d5f07 |
return diff;
|
|
|
0d5f07 |
}
|
|
|
0d5f07 |
|
|
|
0d5f07 |
- _add_stat_to_log(iolog, elapsed, td->o.log_max != 0, priority_bit);
|
|
|
0d5f07 |
+ __add_stat_to_log(iolog, ddir, elapsed, td->o.log_max != 0, priority_bit);
|
|
|
0d5f07 |
|
|
|
0d5f07 |
iolog->avg_last[ddir] = elapsed - (this_window - iolog->avg_msec);
|
|
|
0d5f07 |
return iolog->avg_msec;
|
|
|
0d5f07 |
--
|
|
|
0d5f07 |
2.17.1
|
|
|
0d5f07 |
|
|
|
0d5f07 |
|