Re: [Qemu-block] [PATCH v2 2/2] iotests: simple mirror test with kvm on 1G image

[Max Reitz]

On 29.11.18 11:18, Vladimir Sementsov-Ogievskiy wrote:
> This test is broken without previous commit fixing dead-lock in mirror.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
> ---
>  tests/qemu-iotests/235     | 59 ++++++++++++++++++++++++++++++++++++++
>  tests/qemu-iotests/235.out |  1 +
>  tests/qemu-iotests/group   |  1 +
>  3 files changed, 61 insertions(+)
>  create mode 100755 tests/qemu-iotests/235
>  create mode 100644 tests/qemu-iotests/235.out

I'll get to the first patch in a second, but first a suggestion for this
patch: I think it's not so good to use 2 GB of space for a test (1 GB
for the source, 1 GB for the target).  So I tried my luck and found that
the test works, too, if you just use preallocation=metadata for the
source (instead of actually writing data) and blockdev-mirror'ing the
data to a throttled null-co device.

(Also, the test as-is passes even without patch 1 on tmpfs, at least for
me.  But with the configuration described above, it fails there, too.)

I've attached a diff.

Max

> diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235
> new file mode 100755
> index 0000000000..e5d1ae6593
> --- /dev/null
> +++ b/tests/qemu-iotests/235
> @@ -0,0 +1,59 @@
> +#!/usr/bin/env python
> +#
> +# Simple mirror test
> +#
> +# Copyright (c) 2018 Virtuozzo International GmbH. All rights reserved.
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +#
> +
> +import sys
> +import os
> +import iotests
> +from iotests import qemu_img_create, qemu_io, file_path
> +
> +sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 
> 'scripts'))
> +
> +from qemu import QEMUMachine
> +
> +# Note:
> +# This test was added to check that mirror dead-lock was fixed (see previous
> +# commit before this test addition).
> +# And it didn't reproduce if at least one of the following:
> +# 1. use small image size
> +# 2. use raw format (not qcow2)
> +# 3. drop kvm and use iotests.VM() (maybe, because of qtest) (however, it 
> still
> +#    reproduces, if just drop kvm, but gdb failed to produce full backtraces
> +#    for me)
> +# 4. add iothread
> +
> +size = '1G'
> +
> +iotests.verify_image_format(supported_fmts=['raw', 'qcow2'])
> +
> +disk, target = file_path('disk', 'target')
> +
> +# prepare source image
> +qemu_img_create('-f', iotests.imgfmt, disk, size)
> +qemu_io('-f', iotests.imgfmt, '-c', 'write 0 ' + size, disk)
> +
> +vm = QEMUMachine(iotests.qemu_prog)
> +vm.add_args('-machine', 'pc,accel=kvm')
> +vm.add_args('-drive', 'id=src,file=' + disk)
> +vm.launch()
> +
> +print(vm.qmp('drive-mirror', device='src', target=target, sync='full'))
> +vm.event_wait('BLOCK_JOB_READY')
> +
> +vm.shutdown()
> diff --git a/tests/qemu-iotests/235.out b/tests/qemu-iotests/235.out
> new file mode 100644
> index 0000000000..d6ccbad8fa
> --- /dev/null
> +++ b/tests/qemu-iotests/235.out
> @@ -0,0 +1 @@
> +{u'return': {}}
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index 8c56a0ad11..61a6d98ebd 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -232,3 +232,4 @@
>  232 auto quick
>  233 auto quick
>  234 auto quick migration
> +235 auto quick
> 


diff --git a/tests/qemu-iotests/235 b/tests/qemu-iotests/235
index e5d1ae6593..c5264972b9 100755
--- a/tests/qemu-iotests/235
+++ b/tests/qemu-iotests/235
@@ -21,7 +21,7 @@
 import sys
 import os
 import iotests
-from iotests import qemu_img_create, qemu_io, file_path
+from iotests import qemu_img_create, qemu_io, file_path, log
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'scripts'))
 
@@ -38,22 +38,34 @@ from qemu import QEMUMachine
 #    for me)
 # 4. add iothread
 
-size = '1G'
+size = 1 * 1024 * 1024 * 1024
 
 iotests.verify_image_format(supported_fmts=['raw', 'qcow2'])
 
-disk, target = file_path('disk', 'target')
+disk = file_path('disk')
 
 # prepare source image
-qemu_img_create('-f', iotests.imgfmt, disk, size)
-qemu_io('-f', iotests.imgfmt, '-c', 'write 0 ' + size, disk)
+qemu_img_create('-f', iotests.imgfmt, '-o', 'preallocation=metadata', disk,
+                str(size))
 
 vm = QEMUMachine(iotests.qemu_prog)
 vm.add_args('-machine', 'pc,accel=kvm')
 vm.add_args('-drive', 'id=src,file=' + disk)
 vm.launch()
 
-print(vm.qmp('drive-mirror', device='src', target=target, sync='full'))
+log(vm.qmp('object-add', qom_type='throttle-group', id='tg0',
+           props={ 'x-bps-total': 64 * 1048576 }))
+
+log(vm.qmp('blockdev-add',
+           **{ 'node-name': 'target',
+               'driver': 'throttle',
+               'throttle-group': 'tg0',
+               'file': {
+                   'driver': 'null-co',
+                   'size': size
+                } }))
+
+log(vm.qmp('blockdev-mirror', device='src', target='target', sync='full'))
 vm.event_wait('BLOCK_JOB_READY')
 
 vm.shutdown()
diff --git a/tests/qemu-iotests/235.out b/tests/qemu-iotests/235.out
index d6ccbad8fa..39db621e04 100644
--- a/tests/qemu-iotests/235.out
+++ b/tests/qemu-iotests/235.out
@@ -1 +1,3 @@
-{u'return': {}}
+{"return": {}}
+{"return": {}}
+{"return": {}}

signature.asc
Description: OpenPGP digital signature