From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: Max Reitz <mreitz@redhat.com>,
"qemu-block@nongnu.org" <qemu-block@nongnu.org>
Cc: Kevin Wolf <kwolf@redhat.com>,
"qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
Subject: Re: [Qemu-devel] [PATCH v6 39/42] iotests: Add filter commit test cases
Date: Sat, 31 Aug 2019 11:41:15 +0000 [thread overview]
Message-ID: <098d2ce3-5ff1-8b27-cada-1f738011424d@virtuozzo.com> (raw)
In-Reply-To: <20190809161407.11920-40-mreitz@redhat.com>
09.08.2019 19:14, Max Reitz wrote:
> This patch adds some tests on how commit copes with filter nodes.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/040 | 177 +++++++++++++++++++++++++++++++++++++
> tests/qemu-iotests/040.out | 4 +-
> 2 files changed, 179 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040
> index 6db9abf8e6..a0a0db8889 100755
> --- a/tests/qemu-iotests/040
> +++ b/tests/qemu-iotests/040
> @@ -428,5 +428,182 @@ class TestReopenOverlay(ImageCommitTestCase):
> def test_reopen_overlay(self):
> self.run_commit_test(self.img1, self.img0)
>
> +class TestCommitWithFilters(iotests.QMPTestCase):
> + img0 = os.path.join(iotests.test_dir, '0.img')
> + img1 = os.path.join(iotests.test_dir, '1.img')
> + img2 = os.path.join(iotests.test_dir, '2.img')
> + img3 = os.path.join(iotests.test_dir, '3.img')
> +
> + def setUp(self):
> + qemu_img('create', '-f', iotests.imgfmt, self.img0, '64M')
> + qemu_img('create', '-f', iotests.imgfmt, self.img1, '64M')
> + qemu_img('create', '-f', iotests.imgfmt, self.img2, '64M')
> + qemu_img('create', '-f', iotests.imgfmt, self.img3, '64M')
> +
> + qemu_io('-f', iotests.imgfmt, '-c', 'write -P 1 0M 1M', self.img0)
> + qemu_io('-f', iotests.imgfmt, '-c', 'write -P 2 1M 1M', self.img1)
> + qemu_io('-f', iotests.imgfmt, '-c', 'write -P 3 2M 1M', self.img2)
> + qemu_io('-f', iotests.imgfmt, '-c', 'write -P 4 3M 1M', self.img3)
> +
> + # Distributions of the patterns in the files; this is checked
> + # by tearDown() and should be changed by the test cases as is
> + # necessary
> + self.pattern_files = [self.img0, self.img1, self.img2, self.img3]
> +
> + self.vm = iotests.VM()
> + self.vm.launch()
> + self.has_quit = False
> +
> + result = self.vm.qmp('object-add', qom_type='throttle-group', id='tg')
> + self.assert_qmp(result, 'return', {})
> +
> + result = self.vm.qmp('blockdev-add', **{
> + 'node-name': 'top-filter',
> + 'driver': 'throttle',
> + 'throttle-group': 'tg',
> + 'file': {
> + 'node-name': 'cow-3',
> + 'driver': iotests.imgfmt,
> + 'file': {
> + 'driver': 'file',
> + 'filename': self.img3
> + },
> + 'backing': {
> + 'node-name': 'cow-2',
> + 'driver': iotests.imgfmt,
> + 'file': {
> + 'driver': 'file',
> + 'filename': self.img2
> + },
> + 'backing': {
> + 'node-name': 'cow-1',
> + 'driver': iotests.imgfmt,
> + 'file': {
> + 'driver': 'file',
> + 'filename': self.img1
> + },
> + 'backing': {
> + 'node-name': 'bottom-filter',
> + 'driver': 'throttle',
> + 'throttle-group': 'tg',
> + 'file': {
> + 'node-name': 'cow-0',
> + 'driver': iotests.imgfmt,
> + 'file': {
> + 'driver': 'file',
> + 'filename': self.img0
> + }
> + }
> + }
> + }
> + }
> + }
> + })
> + self.assert_qmp(result, 'return', {})
> +
> + def tearDown(self):
> + self.vm.shutdown(has_quit=self.has_quit)
> +
> + for index in range(len(self.pattern_files)):
you may use enumerate for such cases:
for ind, file in enumerate(self.pattern_files):
...
> + result = qemu_io('-f', iotests.imgfmt,
> + '-c', 'read -P %i %iM 1M' % (index + 1, index),
> + self.pattern_files[index])
> + self.assertFalse('Pattern verification failed' in result)
A bit better would be to keep this loop in a function and do "writes" through it too,
to make it more obvious that they are the same.. But I'm OK with it as is.
> +
> + os.remove(self.img3)
> + os.remove(self.img2)
> + os.remove(self.img1)
> + os.remove(self.img0)
> +
> + # Filters make for funny filenames, so we cannot just use
> + # self.imgX to get them
> + def get_filename(self, node):
> + return self.vm.node_info(node)['image']['filename']
> +
maybe:
def assertHasNode(self, node_name):
self.assertIsNotNone(self.vm.node_info(node_name))
and similar for assertNoNode...
> + def test_filterless_commit(self):
> + self.assert_no_active_block_jobs()
why not just to include this call into setUp() ? Or even, just drop it?
We create and start new vm in setUp, it don't have any block jobs for sure.
> + result = self.vm.qmp('block-commit',
> + job_id='commit',
> + device='top-filter',
> + top_node='cow-2',
> + base_node='cow-1')
> + self.assert_qmp(result, 'return', {})
> + self.wait_until_completed(drive='commit')
> +
> + self.assertIsNotNone(self.vm.node_info('cow-3'))
> + self.assertIsNone(self.vm.node_info('cow-2'))
> + self.assertIsNotNone(self.vm.node_info('cow-1'))
> +
> + # 2 has been comitted into 1
> + self.pattern_files[2] = self.img1
> +
> + def test_commit_through_filter(self):
> + self.assert_no_active_block_jobs()
> + result = self.vm.qmp('block-commit',
> + job_id='commit',
> + device='top-filter',
> + top_node='cow-1',
> + base_node='cow-0')
> + self.assert_qmp(result, 'return', {})
> + self.wait_until_completed(drive='commit')
> +
> + self.assertIsNotNone(self.vm.node_info('cow-2'))
> + self.assertIsNone(self.vm.node_info('cow-1'))
> + self.assertIsNone(self.vm.node_info('bottom-filter'))
> + self.assertIsNotNone(self.vm.node_info('cow-0'))
> +
> + # 1 has been comitted into 0
> + self.pattern_files[1] = self.img0
> +
> + def test_filtered_active_commit_with_filter(self):
> + # Add a device, so the commit job finds a parent it can change
> + # to point to the base node (so we can test that top-filter is
> + # dropped from the graph)
> + result = self.vm.qmp('device_add', id='drv0', driver='virtio-blk',
> + drive='top-filter')
> + self.assert_qmp(result, 'return', {})
> +
> + # Try to release our reference to top-filter; that should not
> + # work because drv0 uses it
> + result = self.vm.qmp('blockdev-del', node_name='top-filter')
> + self.assert_qmp(result, 'error/class', 'GenericError')
> + self.assert_qmp(result, 'error/desc', 'Node top-filter is in use')
> +
> + self.assert_no_active_block_jobs()
> + result = self.vm.qmp('block-commit',
> + job_id='commit',
> + device='top-filter',
> + base_node='cow-2')
> + self.assert_qmp(result, 'return', {})
> + self.complete_and_wait(drive='commit')
> +
> + # Try to release our reference to top-filter again
> + result = self.vm.qmp('blockdev-del', node_name='top-filter')
> + self.assert_qmp(result, 'return', {})
> +
> + self.assertIsNone(self.vm.node_info('top-filter'))
> + self.assertIsNone(self.vm.node_info('cow-3'))
> + self.assertIsNotNone(self.vm.node_info('cow-2'))
It would be good to assert here the cow-2 became drv0 child. However, otherwise
it should be automatically dropped, so it's not necessary.
> +
> + # 3 has been comitted into 2
> + self.pattern_files[3] = self.img2
> +
> + def test_filtered_active_commit_without_filter(self):
> + self.assert_no_active_block_jobs()
> + result = self.vm.qmp('block-commit',
> + job_id='commit',
> + device='top-filter',
> + top_node='cow-3',
> + base_node='cow-2')
> + self.assert_qmp(result, 'return', {})
can we check that really "active" commit is started, i.e. mirror block job?
> + self.complete_and_wait(drive='commit')
> +
> + self.assertIsNotNone(self.vm.node_info('top-filter'))
> + self.assertIsNone(self.vm.node_info('cow-3'))
> + self.assertIsNotNone(self.vm.node_info('cow-2'))
> +
> + # 3 has been comitted into 2
> + self.pattern_files[3] = self.img2
> +
> if __name__ == '__main__':
> iotests.main(supported_fmts=['qcow2', 'qed'])
> diff --git a/tests/qemu-iotests/040.out b/tests/qemu-iotests/040.out
> index 220a5fa82c..fe58934d7a 100644
> --- a/tests/qemu-iotests/040.out
> +++ b/tests/qemu-iotests/040.out
> @@ -1,5 +1,5 @@
> -...............................................
> +...................................................
> ----------------------------------------------------------------------
> -Ran 47 tests
> +Ran 51 tests
>
> OK
>
With or without any of my suggestions:
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
--
Best regards,
Vladimir
next prev parent reply other threads:[~2019-08-31 11:42 UTC|newest]
Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 16:13 [Qemu-devel] [PATCH v6 00/42] block: Deal with filters Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 01/42] block: Mark commit and mirror as filter drivers Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 02/42] copy-on-read: Support compressed writes Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 03/42] throttle: " Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 04/42] block: Add child access functions Max Reitz
2019-08-09 16:56 ` Eric Blake
2019-09-04 16:16 ` Kevin Wolf
2019-09-09 7:56 ` Max Reitz
2019-09-09 9:36 ` Kevin Wolf
2019-09-09 14:04 ` Max Reitz
2019-09-09 16:13 ` Kevin Wolf
2019-09-10 9:14 ` Max Reitz
2019-09-10 10:47 ` Kevin Wolf
2019-09-10 11:36 ` Max Reitz
2019-09-10 12:48 ` Kevin Wolf
2019-09-10 12:59 ` Max Reitz
2019-09-10 13:10 ` Kevin Wolf
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 05/42] block: Add chain helper functions Max Reitz
2019-08-09 17:01 ` Eric Blake
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 06/42] qcow2: Implement .bdrv_storage_child() Max Reitz
2019-08-09 17:07 ` Eric Blake
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 07/42] block: *filtered_cow_child() for *has_zero_init() Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 08/42] block: bdrv_set_backing_hd() is about bs->backing Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 09/42] block: Include filters when freezing backing chain Max Reitz
2019-08-10 13:32 ` Vladimir Sementsov-Ogievskiy
2019-08-12 12:56 ` Max Reitz
2019-09-05 13:05 ` Kevin Wolf
2019-09-09 8:02 ` Max Reitz
2019-09-09 9:40 ` Kevin Wolf
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 10/42] block: Drop bdrv_is_encrypted() Max Reitz
2019-08-10 13:42 ` Vladimir Sementsov-Ogievskiy
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 11/42] block: Add bdrv_supports_compressed_writes() Max Reitz
2019-09-05 13:11 ` Kevin Wolf
2019-09-09 8:09 ` Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 12/42] block: Use bdrv_filtered_rw* where obvious Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 13/42] block: Use CAFs in block status functions Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 14/42] block: Use CAFs when working with backing chains Max Reitz
2019-08-10 15:19 ` Vladimir Sementsov-Ogievskiy
2019-09-05 14:05 ` Kevin Wolf
2019-09-09 8:25 ` Max Reitz
2019-09-09 9:55 ` Kevin Wolf
2019-09-09 14:08 ` Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 15/42] block: Re-evaluate backing file handling in reopen Max Reitz
2019-08-10 16:05 ` Vladimir Sementsov-Ogievskiy
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 16/42] block: Flush all children in generic code Max Reitz
2019-08-10 15:36 ` Vladimir Sementsov-Ogievskiy
2019-08-12 12:58 ` Max Reitz
2019-09-05 16:24 ` Kevin Wolf
2019-09-09 8:31 ` Max Reitz
2019-09-09 10:01 ` Kevin Wolf
2019-09-09 14:15 ` Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 17/42] block: Use CAFs in bdrv_refresh_limits() Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 18/42] block: Use CAFs in bdrv_refresh_filename() Max Reitz
2019-08-10 16:22 ` Vladimir Sementsov-Ogievskiy
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 19/42] block: Use CAF in bdrv_co_rw_vmstate() Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 20/42] block/snapshot: Fix fallback Max Reitz
2019-08-10 16:34 ` Vladimir Sementsov-Ogievskiy
2019-08-12 13:06 ` Max Reitz
2019-09-10 11:56 ` Kevin Wolf
2019-09-10 12:04 ` Max Reitz
2019-09-10 12:49 ` Kevin Wolf
2019-09-10 13:06 ` Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 21/42] block: Use CAFs for debug breakpoints Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 22/42] block: Fix bdrv_get_allocated_file_size's fallback Max Reitz
2019-08-10 16:41 ` Vladimir Sementsov-Ogievskiy
2019-08-12 13:09 ` Max Reitz
2019-08-12 17:14 ` Vladimir Sementsov-Ogievskiy
2019-08-12 19:15 ` Max Reitz
2019-09-10 14:52 ` Kevin Wolf
2019-09-11 6:20 ` Max Reitz
2019-09-11 6:55 ` Kevin Wolf
2019-09-11 7:37 ` Max Reitz
2019-09-11 8:27 ` Kevin Wolf
2019-09-11 10:00 ` Max Reitz
2019-09-11 10:31 ` Kevin Wolf
2019-09-11 11:00 ` Max Reitz
2019-09-12 10:34 ` Kevin Wolf
2019-11-14 13:11 ` Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 23/42] blockdev: Use CAF in external_snapshot_prepare() Max Reitz
2019-09-10 15:02 ` Kevin Wolf
2019-09-11 6:21 ` Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 24/42] block: Use child access functions for QAPI queries Max Reitz
2019-08-10 16:57 ` Vladimir Sementsov-Ogievskiy
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 25/42] mirror: Deal with filters Max Reitz
2019-08-12 11:09 ` Vladimir Sementsov-Ogievskiy
2019-08-12 13:26 ` Max Reitz
2019-08-14 15:17 ` Vladimir Sementsov-Ogievskiy
2019-08-31 9:57 ` Vladimir Sementsov-Ogievskiy
2019-09-02 14:35 ` Max Reitz
2019-09-03 8:32 ` Vladimir Sementsov-Ogievskiy
2019-09-09 7:41 ` Max Reitz
2019-09-13 12:55 ` Kevin Wolf
2019-09-16 10:26 ` Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 26/42] backup: " Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 27/42] commit: " Max Reitz
2019-08-31 10:44 ` Vladimir Sementsov-Ogievskiy
2019-09-02 14:55 ` Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 28/42] stream: " Max Reitz
2019-08-12 11:55 ` Vladimir Sementsov-Ogievskiy
2019-09-13 14:16 ` Kevin Wolf
2019-09-16 9:52 ` Max Reitz
2019-09-16 14:47 ` Kevin Wolf
2019-12-11 12:52 ` Max Reitz
2019-12-11 15:52 ` Kevin Wolf
2019-12-11 16:12 ` Max Reitz
2019-12-11 16:35 ` Kevin Wolf
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 29/42] nbd: Use CAF when looking for dirty bitmap Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 30/42] qemu-img: Use child access functions Max Reitz
2019-08-12 12:14 ` Vladimir Sementsov-Ogievskiy
2019-08-12 13:28 ` Max Reitz
2019-08-14 16:04 ` Vladimir Sementsov-Ogievskiy
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 31/42] block: Drop backing_bs() Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 32/42] block: Make bdrv_get_cumulative_perm() public Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 33/42] blockdev: Fix active commit choice Max Reitz
2019-08-09 16:13 ` [Qemu-devel] [PATCH v6 34/42] block: Inline bdrv_co_block_status_from_*() Max Reitz
2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 35/42] block: Fix check_to_replace_node() Max Reitz
2019-08-15 15:21 ` Vladimir Sementsov-Ogievskiy
2019-08-15 17:01 ` Max Reitz
2019-08-16 11:01 ` Vladimir Sementsov-Ogievskiy
2019-08-16 13:30 ` Max Reitz
2019-08-16 14:24 ` Vladimir Sementsov-Ogievskiy
2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 36/42] iotests: Add tests for mirror @replaces loops Max Reitz
2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 37/42] block: Leave BDS.backing_file constant Max Reitz
2019-08-16 16:16 ` Vladimir Sementsov-Ogievskiy
2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 38/42] iotests: Let complete_and_wait() work with commit Max Reitz
2019-08-23 5:59 ` Vladimir Sementsov-Ogievskiy
2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 39/42] iotests: Add filter commit test cases Max Reitz
2019-08-31 11:41 ` Vladimir Sementsov-Ogievskiy [this message]
2019-09-02 15:06 ` Max Reitz
2019-08-31 12:35 ` Vladimir Sementsov-Ogievskiy
2019-09-02 15:09 ` Max Reitz
2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 40/42] iotests: Add filter mirror " Max Reitz
2019-08-31 12:35 ` Vladimir Sementsov-Ogievskiy
2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 41/42] iotests: Add test for commit in sub directory Max Reitz
2019-08-09 16:14 ` [Qemu-devel] [PATCH v6 42/42] iotests: Test committing to overridden backing Max Reitz
2019-09-03 9:18 ` Vladimir Sementsov-Ogievskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=098d2ce3-5ff1-8b27-cada-1f738011424d@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).