Am 20.11.2019 um 16:41 hat Vladimir Sementsov-Ogievskiy geschrieben:
> 20.11.2019 17:03, Kevin Wolf wrote:
> > Signed-off-by: Kevin Wolf <kw...@redhat.com>
> > ---
> > tests/qemu-iotests/274 | 131 +++++++++++++++++++++++++++++
> > tests/qemu-iotests/274.out | 150 ++++++++++++++++++++++++++++++++++
> > tests/qemu-iotests/group | 1 +
> > tests/qemu-iotests/iotests.py | 2 +-
> > 4 files changed, 283 insertions(+), 1 deletion(-)
> > create mode 100755 tests/qemu-iotests/274
> > create mode 100644 tests/qemu-iotests/274.out
> >
> > diff --git a/tests/qemu-iotests/274 b/tests/qemu-iotests/274
> > new file mode 100755
> > index 0000000000..f3b71e2859
> > --- /dev/null
> > +++ b/tests/qemu-iotests/274
> > @@ -0,0 +1,131 @@
> > +#!/usr/bin/env python
> > +#
> > +# Copyright (C) 2019 Red Hat, Inc.
> > +#
> > +# 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/>.
> > +#
> > +# Creator/Owner: Kevin Wolf <kw...@redhat.com>
> > +#
> > +# Some tests for short backing files and short overlays
> > +
> > +import iotests
> > +import os
> > +
> > +iotests.verify_image_format(supported_fmts=['qcow2'])
> > +iotests.verify_platform(['linux'])
> > +
> > +size_short = 1 * 1024 * 1024
> > +size_long = 2 * 1024 * 1024
> > +size_diff = size_long - size_short
> > +
> > +def create_chain():
> > + iotests.qemu_img_log('create', '-f', iotests.imgfmt, base,
> > + str(size_long))
> > + iotests.qemu_img_log('create', '-f', iotests.imgfmt, '-b', base, mid,
> > + str(size_short))
> > + iotests.qemu_img_log('create', '-f', iotests.imgfmt, '-b', mid, top,
> > + str(size_long))
> > +
> > + iotests.qemu_io_log('-c', 'write -P 1 0 %d' % size_long, base)
> > +
> > +def create_vm():
> > + vm = iotests.VM()
> > + vm.add_blockdev('file,filename=%s,node-name=base-file' % (base))
> > + vm.add_blockdev('%s,file=base-file,node-name=base' % (iotests.imgfmt))
> > + vm.add_blockdev('file,filename=%s,node-name=mid-file' % (mid))
> > + vm.add_blockdev('%s,file=mid-file,node-name=mid,backing=base' %
> > (iotests.imgfmt))
> > + vm.add_drive(top, 'backing=mid,node-name=top')
> > + return vm
> > +
> > +with iotests.FilePath('base') as base, \
> > + iotests.FilePath('mid') as mid, \
> > + iotests.FilePath('top') as top:
> > +
> > + iotests.log('== Commit tests ==')
> > +
> > + create_chain()
> > +
> > + iotests.log('=== Check visible data ===')
> > +
> > + iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, top)
> > + iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff),
> > top)
> > +
> > + iotests.log('=== Checking allocation status ===')
> > +
> > + iotests.qemu_io_log('-c', 'alloc 0 %d' % size_short,
> > + '-c', 'alloc %d %d' % (size_short, size_diff),
> > + base)
> > +
> > + iotests.qemu_io_log('-c', 'alloc 0 %d' % size_short,
> > + '-c', 'alloc %d %d' % (size_short, size_diff),
> > + mid)
> > +
> > + iotests.qemu_io_log('-c', 'alloc 0 %d' % size_short,
> > + '-c', 'alloc %d %d' % (size_short, size_diff),
> > + top)
> > +
> > + iotests.log('=== Checking map ===')
> > +
> > + iotests.qemu_img_log('map', '--output=json', base)
> > + iotests.qemu_img_log('map', '--output=human', base)
> > + iotests.qemu_img_log('map', '--output=json', mid)
> > + iotests.qemu_img_log('map', '--output=human', mid)
> > + iotests.qemu_img_log('map', '--output=json', top)
> > + iotests.qemu_img_log('map', '--output=human', top)
> > +
> > + iotests.log('=== Testing qemu-img commit (top -> mid) ===')
> > +
> > + iotests.qemu_img_log('commit', top)
> > + iotests.img_info_log(mid)
> > + iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, mid)
> > + iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff),
> > mid)
> > +
> > + iotests.log('=== Testing HMP commit (top -> mid) ===')
> > +
> > + create_chain()
> > + with create_vm() as vm:
> > + vm.launch()
> > + vm.qmp_log('human-monitor-command', command_line='commit drive0')
> > +
> > + iotests.img_info_log(mid)
> > + iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, mid)
> > + iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff),
> > mid)
> > +
> > + iotests.log('=== Testing QMP active commit (top -> mid) ===')
> > +
> > + create_chain()
> > + with create_vm() as vm:
> > + vm.launch()
> > + vm.qmp_log('block-commit', device='top', base_node='mid',
> > + job_id='job0', auto_dismiss=False)
> > + vm.run_job('job0', wait=5)
> > +
> > + iotests.img_info_log(mid)
> > + iotests.qemu_io_log('-c', 'read -P 1 0 %d' % size_short, mid)
> > + iotests.qemu_io_log('-c', 'read -P 0 %d %d' % (size_short, size_diff),
> > mid)
> > +
> > +
> > + iotests.log('== Resize tests ==')
> > +
> > + iotests.qemu_img_log('create', '-f', iotests.imgfmt, base, '6G')
> > + iotests.qemu_img_log('create', '-f', iotests.imgfmt, '-b', base, top,
> > '1G')
> > + iotests.qemu_io_log('-c', 'write -P 1 3G 64k', base)
> > + iotests.qemu_io_log('-c', 'write -P 2 5G 64k', base)
> > +
> > + # After this, 0 to 6 GB should be allocated/zeroed
> > + # 6 GB to 8 BG should be unallocated
>
> Hmm, the problem is that the following qemu-img map can't show it, as it
> merges
> 1G..6G and 6G..8G into one chunk..
Hm, true, because it's more about the content of the blocks than about
the allocation status. I'll add a qemu-io 'map' call, which display the
actual allocation status:
1 GiB (0x40000000) bytes not allocated at offset 0 bytes (0x0)
5 GiB (0x140000000) bytes allocated at offset 1 GiB (0x40000000)
2 GiB (0x80000000) bytes not allocated at offset 6 GiB (0x180000000)
> > + iotests.qemu_img_log('resize', '-f', iotests.imgfmt, top, '8G')
> > + iotests.qemu_io_log('-c', 'read -P 0 3G 64k', top)
> > + iotests.qemu_io_log('-c', 'read -P 0 5G 64k', top)
> > + iotests.qemu_img_log('map', '--output=json', top)
> > diff --git a/tests/qemu-iotests/274.out b/tests/qemu-iotests/274.out
> > new file mode 100644
> > index 0000000000..def0ac7d27
> > --- /dev/null
> > +++ b/tests/qemu-iotests/274.out
> > @@ -0,0 +1,150 @@
> > +== Commit tests ==
> > +Formatting 'TEST_DIR/PID-base', fmt=qcow2 size=2097152 cluster_size=65536
> > lazy_refcounts=off refcount_bits=16
> > +
> > +Formatting 'TEST_DIR/PID-mid', fmt=qcow2 size=1048576
> > backing_file=TEST_DIR/PID-base cluster_size=65536 lazy_refcounts=off
> > refcount_bits=16
> > +
> > +Formatting 'TEST_DIR/PID-top', fmt=qcow2 size=2097152
> > backing_file=TEST_DIR/PID-mid cluster_size=65536 lazy_refcounts=off
> > refcount_bits=16
> > +
> > +wrote 2097152/2097152 bytes at offset 0
> > +2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> > +
> > +=== Check visible data ===
> > +read 1048576/1048576 bytes at offset 0
> > +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> > +
> > +read 1048576/1048576 bytes at offset 1048576
> > +1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> > +
> > +=== Checking allocation status ===
> > +1048576/1048576 bytes allocated at offset 0 bytes
> > +1048576/1048576 bytes allocated at offset 1 MiB
> > +
> > +0/1048576 bytes allocated at offset 0 bytes
> > +0/0 bytes allocated at offset 1 MiB
> > +
> > +0/1048576 bytes allocated at offset 0 bytes
> > +0/1048576 bytes allocated at offset 1 MiB
> > +
> > +=== Checking map ===
> > +[{ "start": 0, "length": 2097152, "depth": 0, "zero": false, "data": true,
> > "offset": 327680}]
> > +
> > +Offset Length Mapped to File
> > +0 0x200000 0x50000 TEST_DIR/PID-base
> > +
> > +[{ "start": 0, "length": 1048576, "depth": 1, "zero": false, "data": true,
> > "offset": 327680}]
> > +
> > +Offset Length Mapped to File
> > +0 0x100000 0x50000 TEST_DIR/PID-base
> > +
> > +[{ "start": 0, "length": 1048576, "depth": 2, "zero": false, "data": true,
> > "offset": 327680},
> > +{ "start": 1048576, "length": 1048576, "depth": 0, "zero": true, "data":
> > false}]
>
> I think depth of second chunk should be 1, not 0.. But this is for
> another fixing series.
The part from 1 GB to 6 GB should be 0 without any question, this is
where we wrote zeros into the overlay.
The part from 7 GB to 8 GB is a bit more open to interpretation because
this is unallocated in the overlay and reads zeros because the backing
file is shorter. I think 0 makes sense, but it's debatable.
Kevin
