diff mbox

[v6,6/6] tests: changed block job ready event generation order

Message ID 1468499383-17840-7-git-send-email-den@openvz.org (mailing list archive)
State New, archived
Headers show

Commit Message

Denis V. Lunev July 14, 2016, 12:29 p.m. UTC 
From: Evgeny Yakovlev <eyakovlev@virtuozzo.com>

Due to skipped flushes on bdrv_co_flush BLOCK_JOB_READY events
for driver-mirror and active block-commit commands now arrives faster,
before QMP send successfully returns to caller.

This change expects for block job ready event to arrive before
QMP send successfully returns in block tests 141 144

Signed-off-by: Evgeny Yakovlev <eyakovlev@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Kevin Wolf <kwolf@redhat.com>
CC: Max Reitz <mreitz@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
CC: Fam Zheng <famz@redhat.com>
CC: John Snow <jsnow@redhat.com>
---
 tests/qemu-iotests/141.out | 4 ++--
 tests/qemu-iotests/144.out | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Eric Blake July 14, 2016, 4:07 p.m. UTC | #1 
On 07/14/2016 06:29 AM, Denis V. Lunev wrote:
> From: Evgeny Yakovlev <eyakovlev@virtuozzo.com>
> 
> Due to skipped flushes on bdrv_co_flush BLOCK_JOB_READY events
> for driver-mirror and active block-commit commands now arrives faster,
> before QMP send successfully returns to caller.
> 
> This change expects for block job ready event to arrive before
> QMP send successfully returns in block tests 141 144
> 
> Signed-off-by: Evgeny Yakovlev <eyakovlev@virtuozzo.com>
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> CC: Kevin Wolf <kwolf@redhat.com>
> CC: Max Reitz <mreitz@redhat.com>
> CC: Stefan Hajnoczi <stefanha@redhat.com>
> CC: Fam Zheng <famz@redhat.com>
> CC: John Snow <jsnow@redhat.com>
> ---
>  tests/qemu-iotests/141.out | 4 ++--
>  tests/qemu-iotests/144.out | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Same comment as in 5/6: if the testsuite broke as a result of 4/6, then
this should be squashed in to that patch so that the end result of your
series never lands on a bisection point where the testsuite is broken.
John Snow July 14, 2016, 7:46 p.m. UTC | #2 
On 07/14/2016 12:07 PM, Eric Blake wrote:
> On 07/14/2016 06:29 AM, Denis V. Lunev wrote:
>> From: Evgeny Yakovlev <eyakovlev@virtuozzo.com>
>>
>> Due to skipped flushes on bdrv_co_flush BLOCK_JOB_READY events
>> for driver-mirror and active block-commit commands now arrives faster,
>> before QMP send successfully returns to caller.
>>
>> This change expects for block job ready event to arrive before
>> QMP send successfully returns in block tests 141 144
>>
>> Signed-off-by: Evgeny Yakovlev <eyakovlev@virtuozzo.com>
>> Signed-off-by: Denis V. Lunev <den@openvz.org>
>> CC: Kevin Wolf <kwolf@redhat.com>
>> CC: Max Reitz <mreitz@redhat.com>
>> CC: Stefan Hajnoczi <stefanha@redhat.com>
>> CC: Fam Zheng <famz@redhat.com>
>> CC: John Snow <jsnow@redhat.com>
>> ---
>>  tests/qemu-iotests/141.out | 4 ++--
>>  tests/qemu-iotests/144.out | 2 +-
>>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> Same comment as in 5/6: if the testsuite broke as a result of 4/6, then
> this should be squashed in to that patch so that the end result of your
> series never lands on a bisection point where the testsuite is broken.
> 
> 

Yes, please: all patches must be ordered such that intermediate commits
do not break iotests or 'make check'.

(Sorry for the runaround.)

--js
diff mbox

Patch

diff --git a/tests/qemu-iotests/141.out b/tests/qemu-iotests/141.out
index adceac1..eaf1e60 100644
--- a/tests/qemu-iotests/141.out
+++ b/tests/qemu-iotests/141.out
@@ -18,8 +18,8 @@  Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.
 
 {"return": {}}
 Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.IMGFMT backing_fmt=IMGFMT
-{"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "drv0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}
+{"return": {}}
 {"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: mirror"}}
 {"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "drv0", "len": 0, "offset": 0, "speed": 0, "type": "mirror"}}
@@ -28,8 +28,8 @@  Formatting 'TEST_DIR/o.IMGFMT', fmt=IMGFMT size=1048576 backing_file=TEST_DIR/t.
 === Testing active block-commit ===
 
 {"return": {}}
-{"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "drv0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
+{"return": {}}
 {"error": {"class": "GenericError", "desc": "Node 'drv0' is busy: block device is in use by block job: commit"}}
 {"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "drv0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
diff --git a/tests/qemu-iotests/144.out b/tests/qemu-iotests/144.out
index 410d741..387855c 100644
--- a/tests/qemu-iotests/144.out
+++ b/tests/qemu-iotests/144.out
@@ -12,9 +12,9 @@  Formatting 'TEST_DIR/tmp.qcow2', fmt=qcow2 size=536870912 backing_file=TEST_DIR/
 
 === Performing block-commit on active layer ===
 
-{"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_READY", "data": {"device": "virtio0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
 {"return": {}}
+{"return": {}}
 {"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "BLOCK_JOB_COMPLETED", "data": {"device": "virtio0", "len": 0, "offset": 0, "speed": 0, "type": "commit"}}
 
 === Performing Live Snapshot 2 ===