[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 5/5] iotests: Make 136 less flaky
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH 5/5] iotests: Make 136 less flaky |
Date: |
Thu, 9 Nov 2017 02:38:04 +0100 |
136 executes some AIO requests without a final aio_flush; then it
advances the virtual clock and thus expects the last access time of the
device to be less than the current time when queried (i.e. idle_time_ns
to be greater than 0). However, without the aio_flush, some requests
may be settled after the clock_step invocation. In that case,
idle_time_ns would be 0 and the test fails.
Fix this by adding an aio_flush if any AIO request but some other
aio_flush has been executed.
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/136 | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/136 b/tests/qemu-iotests/136
index 4b994897af..88b97ea7c6 100644
--- a/tests/qemu-iotests/136
+++ b/tests/qemu-iotests/136
@@ -238,6 +238,18 @@ sector = "%d"
for i in range(failed_wr_ops):
ops.append("aio_write %d 512" % bad_offset)
+ # We need an extra aio_flush to settle all outstanding AIO
+ # operations before we can advance the virtual clock, so that
+ # the last access happens before clock_step and idle_time_ns
+ # will be greater than 0
+ extra_flush = 0
+ if rd_ops + wr_ops + invalid_rd_ops + invalid_wr_ops + \
+ failed_rd_ops + failed_wr_ops > 0:
+ extra_flush = 1
+
+ if extra_flush > 0:
+ ops.append("aio_flush")
+
if failed_wr_ops > 0:
highest_offset = max(highest_offset, bad_offset + 512)
@@ -251,7 +263,7 @@ sector = "%d"
self.total_wr_bytes += wr_ops * wr_size
self.total_wr_ops += wr_ops
self.total_wr_merged += wr_merged
- self.total_flush_ops += flush_ops
+ self.total_flush_ops += flush_ops + extra_flush
self.invalid_rd_ops += invalid_rd_ops
self.invalid_wr_ops += invalid_wr_ops
self.failed_rd_ops += failed_rd_ops
--
2.13.6
- [Qemu-block] [PATCH 0/5] iotests: Make some tests less flaky, Max Reitz, 2017/11/08
- [Qemu-block] [PATCH 1/5] iotests: Make 030 less flaky, Max Reitz, 2017/11/08
- [Qemu-block] [PATCH 2/5] iotests: Add missing 'blkdebug::' in 040, Max Reitz, 2017/11/08
- [Qemu-block] [PATCH 3/5] iotests: Make 055 less flaky, Max Reitz, 2017/11/08
- [Qemu-block] [PATCH 4/5] iotests: Make 083 less flaky, Max Reitz, 2017/11/08
- [Qemu-block] [PATCH 5/5] iotests: Make 136 less flaky,
Max Reitz <=
- Re: [Qemu-block] [PATCH 0/5] iotests: Make some tests less flaky, Stefan Hajnoczi, 2017/11/09