aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2019-07-03 19:28:08 +0200
committerMax Reitz <mreitz@redhat.com>2019-07-15 15:48:40 +0200
commit7229e121fd3e299192b03f1a9b59c946e20ed627 (patch)
tree3951274acd62adbd37ce8fa74d99924babe2f73b
parent3cf746b3f16e81b306d732262f4c16bc7707c0ce (diff)
iotests: Fix throttling in 030
Currently, TestParallelOps in 030 creates images that are too small for job throttling to be effective. This is reflected by the fact that it never undoes the throttling. Increase the image size and undo the throttling when the job should be completed. Also, add throttling in test_overlapping_4, or the jobs may not be so overlapping after all. In fact, the error usually emitted here is that node2 simply does not exist, not that overlapping jobs are not allowed -- the fact that this job ignores the exact error messages and just checks the error class is something that should be fixed in a follow-up patch. Signed-off-by: Max Reitz <mreitz@redhat.com> Tested-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Message-id: 20190703172813.6868-8-mreitz@redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
-rwxr-xr-xtests/qemu-iotests/03032
1 files changed, 27 insertions, 5 deletions
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index c6311d1825..2cf8d54dc5 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -154,7 +154,7 @@ class TestSingleDrive(iotests.QMPTestCase):
class TestParallelOps(iotests.QMPTestCase):
num_ops = 4 # Number of parallel block-stream operations
num_imgs = num_ops * 2 + 1
- image_len = num_ops * 512 * 1024
+ image_len = num_ops * 4 * 1024 * 1024
imgs = []
def setUp(self):
@@ -176,11 +176,11 @@ class TestParallelOps(iotests.QMPTestCase):
# Put data into the images we are copying data from
odd_img_indexes = [x for x in reversed(range(self.num_imgs)) if x % 2 == 1]
for i in range(len(odd_img_indexes)):
- # Alternate between 256KB and 512KB.
+ # Alternate between 2MB and 4MB.
# This way jobs will not finish in the same order they were created
- num_kb = 256 + 256 * (i % 2)
+ num_mb = 2 + 2 * (i % 2)
qemu_io('-f', iotests.imgfmt,
- '-c', 'write -P 0xFF %dk %dk' % (i * 512, num_kb),
+ '-c', 'write -P 0xFF %dM %dM' % (i * 4, num_mb),
self.imgs[odd_img_indexes[i]])
# Attach the drive to the VM
@@ -213,6 +213,10 @@ class TestParallelOps(iotests.QMPTestCase):
result = self.vm.qmp('block-stream', device=node_name, job_id=job_id, base=self.imgs[i-2], speed=512*1024)
self.assert_qmp(result, 'return', {})
+ for job in pending_jobs:
+ result = self.vm.qmp('block-job-set-speed', device=job, speed=0)
+ self.assert_qmp(result, 'return', {})
+
# Wait for all jobs to be finished.
while len(pending_jobs) > 0:
for event in self.vm.get_qmp_events(wait=True):
@@ -260,6 +264,9 @@ class TestParallelOps(iotests.QMPTestCase):
result = self.vm.qmp('block-commit', device='drive0', base=self.imgs[0], top=self.imgs[1], job_id='commit-node0')
self.assert_qmp(result, 'error/class', 'GenericError')
+ result = self.vm.qmp('block-job-set-speed', device='stream-node4', speed=0)
+ self.assert_qmp(result, 'return', {})
+
self.wait_until_completed(drive='stream-node4')
self.assert_no_active_block_jobs()
@@ -289,6 +296,9 @@ class TestParallelOps(iotests.QMPTestCase):
result = self.vm.qmp('block-stream', device='drive0', base=self.imgs[5], job_id='stream-drive0')
self.assert_qmp(result, 'error/class', 'GenericError')
+ result = self.vm.qmp('block-job-set-speed', device='commit-node3', speed=0)
+ self.assert_qmp(result, 'return', {})
+
self.wait_until_completed(drive='commit-node3')
# Similar to test_overlapping_2, but here block-commit doesn't use the 'top' parameter.
@@ -309,6 +319,9 @@ class TestParallelOps(iotests.QMPTestCase):
self.assert_qmp(event, 'data/type', 'commit')
self.assert_qmp_absent(event, 'data/error')
+ result = self.vm.qmp('block-job-set-speed', device='commit-drive0', speed=0)
+ self.assert_qmp(result, 'return', {})
+
result = self.vm.qmp('block-job-complete', device='commit-drive0')
self.assert_qmp(result, 'return', {})
@@ -321,13 +334,18 @@ class TestParallelOps(iotests.QMPTestCase):
self.assert_no_active_block_jobs()
# Commit from node2 into node0
- result = self.vm.qmp('block-commit', device='drive0', top=self.imgs[2], base=self.imgs[0])
+ result = self.vm.qmp('block-commit', device='drive0',
+ top=self.imgs[2], base=self.imgs[0],
+ speed=1024*1024)
self.assert_qmp(result, 'return', {})
# Stream from node2 into node4
result = self.vm.qmp('block-stream', device='node4', base_node='node2', job_id='node4')
self.assert_qmp(result, 'error/class', 'GenericError')
+ result = self.vm.qmp('block-job-set-speed', device='drive0', speed=0)
+ self.assert_qmp(result, 'return', {})
+
self.wait_until_completed()
self.assert_no_active_block_jobs()
@@ -378,6 +396,10 @@ class TestParallelOps(iotests.QMPTestCase):
result = self.vm.qmp('block-commit', device='drive0', base=self.imgs[5], speed=1024*1024)
self.assert_qmp(result, 'return', {})
+ for job in ['drive0', 'node4']:
+ result = self.vm.qmp('block-job-set-speed', device=job, speed=0)
+ self.assert_qmp(result, 'return', {})
+
# Wait for all jobs to be finished.
pending_jobs = ['node4', 'drive0']
while len(pending_jobs) > 0: