[PATCH] iotests: Add test for failing qemu-img commit

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] iotests: Add test for failing qemu-img commit

Max Reitz-2
Signed-off-by: Max Reitz <[hidden email]>
---
In order to pass, this depends on "fix: avoid an infinite loop or a
dangling pointer problem in img_commit"
(http://lists.nongnu.org/archive/html/qemu-block/2017-06/msg00443.html)
and on the "block: Don't compare strings in bdrv_reopen_prepare()"
series
(http://lists.nongnu.org/archive/html/qemu-block/2017-06/msg00424.html).
---
 tests/qemu-iotests/020     | 27 +++++++++++++++++++++++++++
 tests/qemu-iotests/020.out | 17 +++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index 7a11110..83d5ef0 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -110,6 +110,33 @@ for offset in $TEST_OFFSETS; do
     io_zero readv $(( offset + 64 * 1024 + 65536 * 4 )) 65536 65536 1
 done
 _check_test_img
+_cleanup
+TEST_IMG=$TEST_IMG_SAVE
+
+echo
+echo 'Testing failing commit'
+echo
+
+# Create an image with a null backing file to which committing will fail (with
+# ENOSPC so we can distinguish the result from some generic EIO which may be
+# generated anywhere in the block layer)
+_make_test_img -b "json:{'driver': 'raw',
+                         'file': {
+                             'driver': 'blkdebug',
+                             'inject-error': [{
+                                 'event': 'write_aio',
+                                 'errno': 28,
+                                 'once': true
+                             }],
+                             'image': {
+                                 'driver': 'null-co'
+                             }}}"
+
+# Just write anything so comitting will not be a no-op
+$QEMU_IO -c 'writev 0 64k' "$TEST_IMG" | _filter_qemu_io
+
+$QEMU_IMG commit "$TEST_IMG"
+_cleanup_test_img
 
 # success, all done
 echo "*** done"
diff --git a/tests/qemu-iotests/020.out b/tests/qemu-iotests/020.out
index 42f6c1b..165b70a 100644
--- a/tests/qemu-iotests/020.out
+++ b/tests/qemu-iotests/020.out
@@ -1075,4 +1075,21 @@ read 65536/65536 bytes at offset 4295098368
 read 65536/65536 bytes at offset 4295294976
 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 No errors were found on the image.
+
+Testing failing commit
+
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 backing_file=json:{'driver': 'raw',,
+                         'file': {
+                             'driver': 'blkdebug',,
+                             'inject-error': [{
+                                 'event': 'write_aio',,
+                                 'errno': 28,,
+                                 'once': true
+                             }],,
+                             'image': {
+                                 'driver': 'null-co'
+                             }}}
+wrote 65536/65536 bytes at offset 0
+64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+qemu-img: Block job failed: No space left on device
 *** done
--
2.9.4


Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] iotests: Add test for failing qemu-img commit

Eric Blake
On 06/16/2017 08:58 AM, Max Reitz wrote:
> Signed-off-by: Max Reitz <[hidden email]>
> ---
> In order to pass, this depends on "fix: avoid an infinite loop or a
> dangling pointer problem in img_commit"
> (http://lists.nongnu.org/archive/html/qemu-block/2017-06/msg00443.html)

Looks like that is now 4172a003

> and on the "block: Don't compare strings in bdrv_reopen_prepare()"
> series
> (http://lists.nongnu.org/archive/html/qemu-block/2017-06/msg00424.html).

Still pending.

> ---
>  tests/qemu-iotests/020     | 27 +++++++++++++++++++++++++++
>  tests/qemu-iotests/020.out | 17 +++++++++++++++++
>  2 files changed, 44 insertions(+)
>
> diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
> index 7a11110..83d5ef0 100755
> --- a/tests/qemu-iotests/020
> +++ b/tests/qemu-iotests/020
> @@ -110,6 +110,33 @@ for offset in $TEST_OFFSETS; do
>      io_zero readv $(( offset + 64 * 1024 + 65536 * 4 )) 65536 65536 1
>  done
>  _check_test_img
> +_cleanup
> +TEST_IMG=$TEST_IMG_SAVE
> +
> +echo
> +echo 'Testing failing commit'
> +echo
> +
> +# Create an image with a null backing file to which committing will fail (with
> +# ENOSPC so we can distinguish the result from some generic EIO which may be
> +# generated anywhere in the block layer)
> +_make_test_img -b "json:{'driver': 'raw',
> +                         'file': {
> +                             'driver': 'blkdebug',
> +                             'inject-error': [{
> +                                 'event': 'write_aio',
> +                                 'errno': 28,
Still nasty that we encoded an errno value rather than using a
stringified enum, but that's not your problem.

> +                                 'once': true
> +                             }],
> +                             'image': {
> +                                 'driver': 'null-co'
> +                             }}}"

The comment does wonders for explaining how it all works!

> +
> +# Just write anything so comitting will not be a no-op

s/comitting/committing/

With the typo fix,
Reviewed-by: Eric Blake <[hidden email]>

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org


signature.asc (617 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] iotests: Add test for failing qemu-img commit

Max Reitz-2
On 2017-06-27 21:52, Eric Blake wrote:

> On 06/16/2017 08:58 AM, Max Reitz wrote:
>> Signed-off-by: Max Reitz <[hidden email]>
>> ---
>> In order to pass, this depends on "fix: avoid an infinite loop or a
>> dangling pointer problem in img_commit"
>> (http://lists.nongnu.org/archive/html/qemu-block/2017-06/msg00443.html)
>
> Looks like that is now 4172a003
>
>> and on the "block: Don't compare strings in bdrv_reopen_prepare()"
>> series
>> (http://lists.nongnu.org/archive/html/qemu-block/2017-06/msg00424.html).
>
> Still pending.
By the way, yes, it's still pending because I got stopped in the middle
of writing the QObject test case and now a bit of other stuff came up
this week... I haven't forgotten, but let's see whether I get to finish
it later today.

>> ---
>>  tests/qemu-iotests/020     | 27 +++++++++++++++++++++++++++
>>  tests/qemu-iotests/020.out | 17 +++++++++++++++++
>>  2 files changed, 44 insertions(+)
>>
>> diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
>> index 7a11110..83d5ef0 100755
>> --- a/tests/qemu-iotests/020
>> +++ b/tests/qemu-iotests/020
>> @@ -110,6 +110,33 @@ for offset in $TEST_OFFSETS; do
>>      io_zero readv $(( offset + 64 * 1024 + 65536 * 4 )) 65536 65536 1
>>  done
>>  _check_test_img
>> +_cleanup
>> +TEST_IMG=$TEST_IMG_SAVE
>> +
>> +echo
>> +echo 'Testing failing commit'
>> +echo
>> +
>> +# Create an image with a null backing file to which committing will fail (with
>> +# ENOSPC so we can distinguish the result from some generic EIO which may be
>> +# generated anywhere in the block layer)
>> +_make_test_img -b "json:{'driver': 'raw',
>> +                         'file': {
>> +                             'driver': 'blkdebug',
>> +                             'inject-error': [{
>> +                                 'event': 'write_aio',
>> +                                 'errno': 28,
>
> Still nasty that we encoded an errno value rather than using a
> stringified enum, but that's not your problem.
>
>> +                                 'once': true
>> +                             }],
>> +                             'image': {
>> +                                 'driver': 'null-co'
>> +                             }}}"
>
> The comment does wonders for explaining how it all works!
>
>> +
>> +# Just write anything so comitting will not be a no-op
>
> s/comitting/committing/
>
> With the typo fix,
> Reviewed-by: Eric Blake <[hidden email]>
Thanks, as always!

Max


signature.asc (510 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] iotests: Add test for failing qemu-img commit

Max Reitz-2
In reply to this post by Max Reitz-2
On 2017-06-16 15:58, Max Reitz wrote:

> Signed-off-by: Max Reitz <[hidden email]>
> ---
> In order to pass, this depends on "fix: avoid an infinite loop or a
> dangling pointer problem in img_commit"
> (http://lists.nongnu.org/archive/html/qemu-block/2017-06/msg00443.html)
> and on the "block: Don't compare strings in bdrv_reopen_prepare()"
> series
> (http://lists.nongnu.org/archive/html/qemu-block/2017-06/msg00424.html).
> ---
>  tests/qemu-iotests/020     | 27 +++++++++++++++++++++++++++
>  tests/qemu-iotests/020.out | 17 +++++++++++++++++
>  2 files changed, 44 insertions(+)
Finally applied to my block tree:

https://github.com/XanClic/qemu/commits/block

Max


signature.asc (523 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] iotests: Add test for failing qemu-img commit

Max Reitz-2
On 2017-11-10 22:21, Max Reitz wrote:

> On 2017-06-16 15:58, Max Reitz wrote:
>> Signed-off-by: Max Reitz <[hidden email]>
>> ---
>> In order to pass, this depends on "fix: avoid an infinite loop or a
>> dangling pointer problem in img_commit"
>> (http://lists.nongnu.org/archive/html/qemu-block/2017-06/msg00443.html)
>> and on the "block: Don't compare strings in bdrv_reopen_prepare()"
>> series
>> (http://lists.nongnu.org/archive/html/qemu-block/2017-06/msg00424.html).
>> ---
>>  tests/qemu-iotests/020     | 27 +++++++++++++++++++++++++++
>>  tests/qemu-iotests/020.out | 17 +++++++++++++++++
>>  2 files changed, 44 insertions(+)
>
> Finally applied to my block tree:
>
> https://github.com/XanClic/qemu/commits/block
...and dropped again because I had to drop the series this depends on.

Max


signature.asc (523 bytes) Download Attachment