aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2019-06-13 00:08:39 +0200
committerKevin Wolf <kwolf@redhat.com>2019-07-19 15:17:55 +0200
commit49278ec065da3fbf90f7effcde3b39ac606b2e9e (patch)
treeb71b421d75168926c8739a4992b59f13d8847998
parente6f0ac4d52ae99cf88d66bca8746beb0d25ef0cd (diff)
downloadqemu-49278ec065da3fbf90f7effcde3b39ac606b2e9e.zip
qemu-49278ec065da3fbf90f7effcde3b39ac606b2e9e.tar.gz
qemu-49278ec065da3fbf90f7effcde3b39ac606b2e9e.tar.bz2
iotests: Test quitting with job on throttled node
When qemu quits, all throttling should be ignored. That means, if there is a mirror job running from a throttled node, it should be cancelled immediately and qemu close without blocking. Signed-off-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rwxr-xr-xtests/qemu-iotests/21855
-rw-r--r--tests/qemu-iotests/218.out4
2 files changed, 57 insertions, 2 deletions
diff --git a/tests/qemu-iotests/218 b/tests/qemu-iotests/218
index 92c331b..2554d84 100755
--- a/tests/qemu-iotests/218
+++ b/tests/qemu-iotests/218
@@ -27,9 +27,9 @@
# Creator/Owner: Max Reitz <mreitz@redhat.com>
import iotests
-from iotests import log
+from iotests import log, qemu_img, qemu_io_silent
-iotests.verify_platform(['linux'])
+iotests.verify_image_format(supported_fmts=['qcow2', 'raw'])
# Launches the VM, adds two null-co nodes (source and target), and
@@ -136,3 +136,54 @@ with iotests.VM() as vm:
log(vm.event_wait('BLOCK_JOB_CANCELLED'),
filters=[iotests.filter_qmp_event])
+
+log('')
+log('=== Cancel mirror job from throttled node by quitting ===')
+log('')
+
+with iotests.VM() as vm, \
+ iotests.FilePath('src.img') as src_img_path:
+
+ assert qemu_img('create', '-f', iotests.imgfmt, src_img_path, '64M') == 0
+ assert qemu_io_silent('-f', iotests.imgfmt, src_img_path,
+ '-c', 'write -P 42 0M 64M') == 0
+
+ vm.launch()
+
+ ret = vm.qmp('object-add', qom_type='throttle-group', id='tg',
+ props={'x-bps-read': 4096})
+ assert ret['return'] == {}
+
+ ret = vm.qmp('blockdev-add',
+ node_name='source',
+ driver=iotests.imgfmt,
+ file={
+ 'driver': 'file',
+ 'filename': src_img_path
+ })
+ assert ret['return'] == {}
+
+ ret = vm.qmp('blockdev-add',
+ node_name='throttled-source',
+ driver='throttle',
+ throttle_group='tg',
+ file='source')
+ assert ret['return'] == {}
+
+ ret = vm.qmp('blockdev-add',
+ node_name='target',
+ driver='null-co',
+ size=(64 * 1048576))
+ assert ret['return'] == {}
+
+ ret = vm.qmp('blockdev-mirror',
+ job_id='mirror',
+ device='throttled-source',
+ target='target',
+ sync='full')
+ assert ret['return'] == {}
+
+ log(vm.qmp('quit'))
+
+ with iotests.Timeout(5, 'Timeout waiting for VM to quit'):
+ vm.shutdown(has_quit=True)
diff --git a/tests/qemu-iotests/218.out b/tests/qemu-iotests/218.out
index 825a657..5a86a97 100644
--- a/tests/qemu-iotests/218.out
+++ b/tests/qemu-iotests/218.out
@@ -28,3 +28,7 @@ Cancelling job
Cancelling job
{"return": {}}
{"data": {"device": "mirror", "len": 1048576, "offset": 1048576, "speed": 0, "type": "mirror"}, "event": "BLOCK_JOB_CANCELLED", "timestamp": {"microseconds": "USECS", "seconds": "SECS"}}
+
+=== Cancel mirror job from throttled node by quitting ===
+
+{"return": {}}