| Message ID | 1603390423-980205-9-git-send-email-andrey.shinkevich@virtuozzo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Apply COR-filter to the block-stream permanently | expand |
22.10.2020 21:13, Andrey Shinkevich wrote: > The test case #310 is similar to #216 by Max Reitz. The difference is > that the test #310 involves a bottom node to the COR filter driver. > > Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> > --- > tests/qemu-iotests/310 | 109 +++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/310.out | 15 +++++++ > tests/qemu-iotests/group | 3 +- > 3 files changed, 126 insertions(+), 1 deletion(-) > create mode 100755 tests/qemu-iotests/310 > create mode 100644 tests/qemu-iotests/310.out > > diff --git a/tests/qemu-iotests/310 b/tests/qemu-iotests/310 > new file mode 100755 > index 0000000..5ad7ad2 > --- /dev/null > +++ b/tests/qemu-iotests/310 > @@ -0,0 +1,109 @@ > +#!/usr/bin/env python3 > +# > +# Copy-on-read tests using a COR filter with a bottom node > +# > +# Copyright (c) 2020 Virtuozzo International GmbH Probably you should keep original copyright too. > +# > +# 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 iotests > +from iotests import log, qemu_img, qemu_io_silent > + > +# Need backing file support > +iotests.script_initialize(supported_fmts=['qcow2', 'qcow', 'qed', 'vmdk'], > + supported_platforms=['linux']) > + > +log('') > +log('=== Copy-on-read across nodes ===') > +log('') > + > +# This test is similar to the 216 one by Max Reitz <mreitz@redhat.com> > +# The difference is that this test case involves a bottom node to the > +# COR filter driver. > + > +with iotests.FilePath('base.img') as base_img_path, \ > + iotests.FilePath('mid.img') as mid_img_path, \ > + iotests.FilePath('top.img') as top_img_path, \ > + iotests.VM() as vm: > + > + log('--- Setting up images ---') > + log('') > + > + assert qemu_img('create', '-f', iotests.imgfmt, base_img_path, '64M') == 0 > + assert qemu_io_silent(base_img_path, '-c', 'write -P 1 0M 1M') == 0 > + assert qemu_io_silent(base_img_path, '-c', 'write -P 1 3M 1M') == 0 > + assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_path, > + '-F', iotests.imgfmt, mid_img_path) == 0 > + assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 2M 1M') == 0 > + assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 4M 1M') == 0 > + assert qemu_img('create', '-f', iotests.imgfmt, '-b', mid_img_path, > + '-F', iotests.imgfmt, top_img_path) == 0 > + assert qemu_io_silent(top_img_path, '-c', 'write -P 2 1M 1M') == 0 An ascii-art of what we have done won't hart, like: # 0 1 2 3 4 # top 2 # mid 3 3 # base 1 1 > + > + log('Done') > + > + log('') > + log('--- Doing COR ---') > + log('') > + > + vm.launch() > + > + log(vm.qmp('blockdev-add', > + node_name='node0', > + driver='copy-on-read', > + bottom='node2', > + file={ > + 'driver': iotests.imgfmt, > + 'file': { > + 'driver': 'file', > + 'filename': top_img_path > + }, > + 'backing': { > + 'node-name': 'node2', > + 'driver': iotests.imgfmt, > + 'file': { > + 'driver': 'file', > + 'filename': mid_img_path > + }, > + 'backing': { > + #'node-name': 'node2', > + 'driver': iotests.imgfmt, > + 'file': { > + 'driver': 'file', > + 'filename': base_img_path > + } > + }, > + } > + })) > + > + # Trigger COR > + log(vm.qmp('human-monitor-command', > + command_line='qemu-io node0 "read 0 5M"')) > + > + vm.shutdown() > + > + log('') > + log('--- Checking COR result ---') > + log('') > + > + assert qemu_io_silent(base_img_path, '-c', 'discard 0 4M') == 0 > + assert qemu_io_silent(mid_img_path, '-c', 'discard 0M 5M') == 0 > + assert qemu_io_silent(top_img_path, '-c', 'read -P 1 0M 1M') != 0 Better assert what it should be instead of what it should not: assert qemu_io_silent(top_img_path, '-c', 'read -P 0 0 1M') == 0 > + assert qemu_io_silent(top_img_path, '-c', 'read -P 2 1M 1M') == 0 > + assert qemu_io_silent(top_img_path, '-c', 'read -P 3 2M 1M') == 0 > + assert qemu_io_silent(top_img_path, '-c', 'read -P 1 3M 1M') != 0 and here assert qemu_io_silent(top_img_path, '-c', 'read -P 0 3M 1M') == 0 > + assert qemu_io_silent(top_img_path, '-c', 'read -P 3 4M 1M') == 0 > + > + log('Done') > diff --git a/tests/qemu-iotests/310.out b/tests/qemu-iotests/310.out > new file mode 100644 > index 0000000..a70aa5c > --- /dev/null > +++ b/tests/qemu-iotests/310.out > @@ -0,0 +1,15 @@ > + > +=== Copy-on-read across nodes === > + > +--- Setting up images --- > + > +Done > + > +--- Doing COR --- > + > +{"return": {}} > +{"return": ""} > + > +--- Checking COR result --- > + > +Done > diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group > index 3432989..769029b 100644 > --- a/tests/qemu-iotests/group > +++ b/tests/qemu-iotests/group > @@ -314,4 +314,5 @@ > 303 rw quick > 304 rw quick > 305 rw quick > -307 rw quick export > +307 rw quick > +310 rw quick export > you shouldn't modify 307... line here, and I think "export" is unrelated. so, with 307 as is, and add 310 without "export" group, and also two my previous suggestions: Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
diff --git a/tests/qemu-iotests/310 b/tests/qemu-iotests/310 new file mode 100755 index 0000000..5ad7ad2 --- /dev/null +++ b/tests/qemu-iotests/310 @@ -0,0 +1,109 @@ +#!/usr/bin/env python3 +# +# Copy-on-read tests using a COR filter with a bottom node +# +# Copyright (c) 2020 Virtuozzo International GmbH +# +# 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 iotests +from iotests import log, qemu_img, qemu_io_silent + +# Need backing file support +iotests.script_initialize(supported_fmts=['qcow2', 'qcow', 'qed', 'vmdk'], + supported_platforms=['linux']) + +log('') +log('=== Copy-on-read across nodes ===') +log('') + +# This test is similar to the 216 one by Max Reitz <mreitz@redhat.com> +# The difference is that this test case involves a bottom node to the +# COR filter driver. + +with iotests.FilePath('base.img') as base_img_path, \ + iotests.FilePath('mid.img') as mid_img_path, \ + iotests.FilePath('top.img') as top_img_path, \ + iotests.VM() as vm: + + log('--- Setting up images ---') + log('') + + assert qemu_img('create', '-f', iotests.imgfmt, base_img_path, '64M') == 0 + assert qemu_io_silent(base_img_path, '-c', 'write -P 1 0M 1M') == 0 + assert qemu_io_silent(base_img_path, '-c', 'write -P 1 3M 1M') == 0 + assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_path, + '-F', iotests.imgfmt, mid_img_path) == 0 + assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 2M 1M') == 0 + assert qemu_io_silent(mid_img_path, '-c', 'write -P 3 4M 1M') == 0 + assert qemu_img('create', '-f', iotests.imgfmt, '-b', mid_img_path, + '-F', iotests.imgfmt, top_img_path) == 0 + assert qemu_io_silent(top_img_path, '-c', 'write -P 2 1M 1M') == 0 + + log('Done') + + log('') + log('--- Doing COR ---') + log('') + + vm.launch() + + log(vm.qmp('blockdev-add', + node_name='node0', + driver='copy-on-read', + bottom='node2', + file={ + 'driver': iotests.imgfmt, + 'file': { + 'driver': 'file', + 'filename': top_img_path + }, + 'backing': { + 'node-name': 'node2', + 'driver': iotests.imgfmt, + 'file': { + 'driver': 'file', + 'filename': mid_img_path + }, + 'backing': { + #'node-name': 'node2', + 'driver': iotests.imgfmt, + 'file': { + 'driver': 'file', + 'filename': base_img_path + } + }, + } + })) + + # Trigger COR + log(vm.qmp('human-monitor-command', + command_line='qemu-io node0 "read 0 5M"')) + + vm.shutdown() + + log('') + log('--- Checking COR result ---') + log('') + + assert qemu_io_silent(base_img_path, '-c', 'discard 0 4M') == 0 + assert qemu_io_silent(mid_img_path, '-c', 'discard 0M 5M') == 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 1 0M 1M') != 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 2 1M 1M') == 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 3 2M 1M') == 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 1 3M 1M') != 0 + assert qemu_io_silent(top_img_path, '-c', 'read -P 3 4M 1M') == 0 + + log('Done') diff --git a/tests/qemu-iotests/310.out b/tests/qemu-iotests/310.out new file mode 100644 index 0000000..a70aa5c --- /dev/null +++ b/tests/qemu-iotests/310.out @@ -0,0 +1,15 @@ + +=== Copy-on-read across nodes === + +--- Setting up images --- + +Done + +--- Doing COR --- + +{"return": {}} +{"return": ""} + +--- Checking COR result --- + +Done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 3432989..769029b 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -314,4 +314,5 @@ 303 rw quick 304 rw quick 305 rw quick -307 rw quick export +307 rw quick +310 rw quick export
The test case #310 is similar to #216 by Max Reitz. The difference is that the test #310 involves a bottom node to the COR filter driver. Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> --- tests/qemu-iotests/310 | 109 +++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/310.out | 15 +++++++ tests/qemu-iotests/group | 3 +- 3 files changed, 126 insertions(+), 1 deletion(-) create mode 100755 tests/qemu-iotests/310 create mode 100644 tests/qemu-iotests/310.out