The following changes since commit 86f40280e27474c666fea75cc705caeaf94f6346:
Change iolog overlap assert to a debug dump (2012-02-10 21:58:46 +0100)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (3):
Only attempt zone switch if we have zones enabled
Add job files for zone bug
Revert "Change iolog overlap assert to a debug dump"
io_u.c | 2 +-
iolog.c | 13 +------------
t/jobs/t0002-13af05ae-post | 24 ++++++++++++++++++++++++
t/jobs/t0002-13af05ae-pre | 23 +++++++++++++++++++++++
4 files changed, 49 insertions(+), 13 deletions(-)
create mode 100644 t/jobs/t0002-13af05ae-post
create mode 100644 t/jobs/t0002-13af05ae-pre
---
Diff of recent changes:
diff --git a/io_u.c b/io_u.c
index d794f01..161c2cb 100644
--- a/io_u.c
+++ b/io_u.c
@@ -668,7 +668,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
/*
* See if it's time to switch to a new zone
*/
- if (td->zone_bytes >= td->o.zone_size) {
+ if (td->zone_bytes >= td->o.zone_size && td->o.zone_skip) {
td->zone_bytes = 0;
io_u->file->file_offset += td->o.zone_range + td->o.zone_skip;
io_u->file->last_pos = io_u->file->file_offset;
diff --git a/iolog.c b/iolog.c
index c1764ba..1d61ba2 100644
--- a/iolog.c
+++ b/iolog.c
@@ -176,12 +176,6 @@ void prune_io_piece_log(struct thread_data *td)
}
}
-static void dump_ipo(struct io_piece *ipo, const char *msg)
-{
- printf("%s\n", msg);
- printf("\toffset %llu, len %lu, fl %x, ddir %d\n", ipo->offset, ipo->len, ipo->flags, ipo->ddir);
-}
-
/*
* log a successful write, so we can unwind the log for verify
*/
@@ -245,12 +239,7 @@ restart:
else if (ipo->offset > __ipo->offset)
p = &(*p)->rb_right;
else {
- if (ipo->len != __ipo->len) {
- log_err("fio: unexpected ipo overlap!\n");
- log_err("fio: please report this issue.\n");
- dump_ipo(ipo, "ipo");
- dump_ipo(__ipo, "__ipo");
- }
+ assert(ipo->len == __ipo->len);
td->io_hist_len--;
rb_erase(parent, &td->io_hist_tree);
remove_trim_entry(td, __ipo);
diff --git a/t/jobs/t0002-13af05ae-post b/t/jobs/t0002-13af05ae-post
new file mode 100644
index 0000000..b7d5bab
--- /dev/null
+++ b/t/jobs/t0002-13af05ae-post
@@ -0,0 +1,24 @@
+[global]
+ioengine=libaio
+direct=1
+filename=/dev/fioa
+iodepth=128
+size=1G
+loops=1
+group_reporting=1
+readwrite=read
+do_verify=1
+verify=md5
+verify_fatal=1
+numjobs=1
+thread
+bssplit=512/50:1M/50
+
+[thread0]
+offset=0G
+
+[thread-mix0]
+offset=4G
+size=1G
+readwrite=rw
+bsrange=512:1M
diff --git a/t/jobs/t0002-13af05ae-pre b/t/jobs/t0002-13af05ae-pre
new file mode 100644
index 0000000..77dd48f
--- /dev/null
+++ b/t/jobs/t0002-13af05ae-pre
@@ -0,0 +1,23 @@
+[global]
+ioengine=libaio
+direct=1
+filename=/dev/fioa
+iodepth=128
+size=1G
+loops=1
+group_reporting=1
+readwrite=write
+do_verify=0
+verify=md5
+numjobs=1
+thread
+bssplit=512/50:1M/50
+
+[thread0]
+offset=0G
+
+[thread-mix0]
+offset=4G
+readwrite=rw
+size=1G
+bsrange=512:1M
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
