[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/53] iotests/129: Use throttle node
From: |
Max Reitz |
Subject: |
[PULL 20/53] iotests/129: Use throttle node |
Date: |
Tue, 26 Jan 2021 15:19:43 +0100 |
Throttling on the BB has not affected block jobs in a while, so it is
possible that one of the jobs in 129 finishes before the VM is stopped.
We can fix that by running the job from a throttle node.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210118105720.14824-7-mreitz@redhat.com>
---
tests/qemu-iotests/129 | 37 +++++++++++++------------------------
1 file changed, 13 insertions(+), 24 deletions(-)
diff --git a/tests/qemu-iotests/129 b/tests/qemu-iotests/129
index 0f2e5418ef..14c057f8ad 100755
--- a/tests/qemu-iotests/129
+++ b/tests/qemu-iotests/129
@@ -33,20 +33,18 @@ class TestStopWithBlockJob(iotests.QMPTestCase):
iotests.qemu_img('create', '-f', iotests.imgfmt, self.test_img,
"-b", self.base_img, '-F', iotests.imgfmt)
iotests.qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x5d 1M 128M',
self.test_img)
- self.vm = iotests.VM().add_drive(self.test_img)
+ self.vm = iotests.VM()
+ self.vm.add_object('throttle-group,id=tg0,x-bps-total=1024')
+
+ source_drive = 'driver=throttle,' \
+ 'throttle-group=tg0,' \
+ f'file.driver={iotests.imgfmt},' \
+ f'file.file.filename={self.test_img}'
+
+ self.vm.add_drive(None, source_drive)
self.vm.launch()
def tearDown(self):
- params = {"device": "drive0",
- "bps": 0,
- "bps_rd": 0,
- "bps_wr": 0,
- "iops": 0,
- "iops_rd": 0,
- "iops_wr": 0,
- }
- result = self.vm.qmp("block_set_io_throttle", conv_keys=False,
- **params)
self.vm.shutdown()
for img in (self.test_img, self.target_img, self.base_img):
iotests.try_remove(img)
@@ -54,33 +52,24 @@ class TestStopWithBlockJob(iotests.QMPTestCase):
def do_test_stop(self, cmd, **args):
"""Test 'stop' while block job is running on a throttled drive.
The 'stop' command shouldn't drain the job"""
- params = {"device": "drive0",
- "bps": 1024,
- "bps_rd": 0,
- "bps_wr": 0,
- "iops": 0,
- "iops_rd": 0,
- "iops_wr": 0,
- }
- result = self.vm.qmp("block_set_io_throttle", conv_keys=False,
- **params)
- self.assert_qmp(result, 'return', {})
result = self.vm.qmp(cmd, **args)
self.assert_qmp(result, 'return', {})
+
result = self.vm.qmp("stop")
self.assert_qmp(result, 'return', {})
result = self.vm.qmp("query-block-jobs")
+
self.assert_qmp(result, 'return[0]/status', 'running')
self.assert_qmp(result, 'return[0]/ready', False)
def test_drive_mirror(self):
self.do_test_stop("drive-mirror", device="drive0",
- target=self.target_img,
+ target=self.target_img, format=iotests.imgfmt,
sync="full")
def test_drive_backup(self):
self.do_test_stop("drive-backup", device="drive0",
- target=self.target_img,
+ target=self.target_img, format=iotests.imgfmt,
sync="full")
def test_block_commit(self):
--
2.29.2
- [PULL 12/53] iotests: 30: prepare to COR filter insertion by stream job, (continued)
[PULL 17/53] iotests: Move try_remove to iotests.py, Max Reitz, 2021/01/26
[PULL 18/53] iotests/129: Remove test images in tearDown(), Max Reitz, 2021/01/26
[PULL 15/53] iotests.py: Assume a couple of variables as given, Max Reitz, 2021/01/26
[PULL 22/53] iotests/129: Limit mirror job's buffer size, Max Reitz, 2021/01/26
[PULL 20/53] iotests/129: Use throttle node,
Max Reitz <=
[PULL 25/53] coroutine-sigaltstack: Add SIGUSR2 mutex, Max Reitz, 2021/01/26
[PULL 21/53] iotests/129: Actually test a commit job, Max Reitz, 2021/01/26
[PULL 19/53] iotests/129: Do not check @busy, Max Reitz, 2021/01/26
[PULL 24/53] iotests/300: Clean up pylint and mypy complaints, Max Reitz, 2021/01/26
[PULL 29/53] block/block-copy: add max_chunk and max_workers parameters, Max Reitz, 2021/01/26
[PULL 26/53] qapi: backup: add perf.use-copy-range parameter, Max Reitz, 2021/01/26
[PULL 27/53] block/block-copy: More explicit call_state, Max Reitz, 2021/01/26
[PULL 28/53] block/block-copy: implement block_copy_async, Max Reitz, 2021/01/26
[PULL 23/53] iotests/129: Clean up pylint and mypy complaints, Max Reitz, 2021/01/26
[PULL 30/53] block/block-copy: add list of all call-states, Max Reitz, 2021/01/26