| Message ID | 20210216164527.37745-6-vsementsov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | parallels: load bitmap extension | expand |
On 2/16/21 7:45 PM, Vladimir Sementsov-Ogievskiy wrote: > Test support for reading bitmap from parallels image format. > parallels-with-bitmap.bz2 is generated on Virtuozzo by > parallels-with-bitmap.sh > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > .../sample_images/parallels-with-bitmap.bz2 | Bin 0 -> 203 bytes > .../sample_images/parallels-with-bitmap.sh | 33 ++++++++++ > .../qemu-iotests/tests/parallels-read-bitmap | 57 ++++++++++++++++++ > .../tests/parallels-read-bitmap.out | 6 ++ > 4 files changed, 96 insertions(+) > create mode 100644 tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2 > create mode 100755 tests/qemu-iotests/sample_images/parallels-with-bitmap.sh > create mode 100755 tests/qemu-iotests/tests/parallels-read-bitmap > create mode 100644 tests/qemu-iotests/tests/parallels-read-bitmap.out > > diff --git a/tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2 b/tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2 > new file mode 100644 > index 0000000000000000000000000000000000000000..54892fd4d01bf743d395bd4f3d896494146ab5a9 > GIT binary patch > literal 203 > zcmV;+05tzXT4*^jL0KkKS@=;0bpT+Hf7|^?Km<xfFyKQJ7=Y^F-%vt;00~Ysa6|-= > zk&7Szk`SoS002EkfMftPG<ipnsiCK}K_sNmm}me3FiZr%Oaf_u5F8kD;mB_~cxD-r > z5P$(X{&Tq5C`<xK02D?NNdN+t$~z$m00O|zFh^ynq*yaCtkn+NZzWom<#OEoF`?zb > zv(i3x^K~wt!aLPcRBP+PckUsIh6*LgjYSh0`}#7hMC9NR5D)+W0d&8Mxgwk>NPH-R > Fx`3oHQ9u9y > > literal 0 > HcmV?d00001 > > diff --git a/tests/qemu-iotests/sample_images/parallels-with-bitmap.sh b/tests/qemu-iotests/sample_images/parallels-with-bitmap.sh > new file mode 100755 > index 0000000000..e4a1d71277 > --- /dev/null > +++ b/tests/qemu-iotests/sample_images/parallels-with-bitmap.sh > @@ -0,0 +1,33 @@ do we need Copyright notice here? I am unsure that this script is to be acceptable in QEMU repo. Anyway, it looks fine :) > +#!/bin/bash > + > +CT=parallels-with-bitmap-ct > +DIR=$PWD/parallels-with-bitmap-dir > +IMG=$DIR/root.hds > +XML=$DIR/DiskDescriptor.xml > +TARGET=parallels-with-bitmap.bz2 > + > +rm -rf $DIR > + > +prlctl create $CT --vmtype ct > +prlctl set $CT --device-add hdd --image $DIR --recreate --size 2G > + > +# cleanup the image > +qemu-img create -f parallels $IMG 64G > + > +# create bitmap > +prlctl backup $CT > + > +prlctl set $CT --device-del hdd1 > +prlctl destroy $CT > + > +dev=$(ploop mount $XML | sed -n 's/^Adding delta dev=\(\/dev\/ploop[0-9]\+\).*/\1/p') > +dd if=/dev/zero of=$dev bs=64K seek=5 count=2 oflag=direct > +dd if=/dev/zero of=$dev bs=64K seek=30 count=1 oflag=direct > +dd if=/dev/zero of=$dev bs=64K seek=10 count=3 oflag=direct > +ploop umount $XML # bitmap name will be in the output > + > +bzip2 -z $IMG > + > +mv $IMG.bz2 $TARGET > + > +rm -rf $DIR > diff --git a/tests/qemu-iotests/tests/parallels-read-bitmap b/tests/qemu-iotests/tests/parallels-read-bitmap > new file mode 100755 > index 0000000000..b50b79f509 > --- /dev/null > +++ b/tests/qemu-iotests/tests/parallels-read-bitmap > @@ -0,0 +1,57 @@ > +#!/usr/bin/env python3 > +# > +# Test parallels load bitmap > +# > +# Copyright (c) 2021 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 json > +import iotests > +from iotests import qemu_nbd_popen, qemu_img_pipe, log, file_path > + > +iotests.script_initialize(supported_fmts=['parallels']) > + > +nbd_sock = file_path('nbd-sock', base_dir=iotests.sock_dir) > +disk = iotests.file_path('disk') > +bitmap = 'e4f2eed0-37fe-4539-b50b-85d2e7fd235f' > +nbd_opts = f'driver=nbd,server.type=unix,server.path={nbd_sock}' \ > + f',x-dirty-bitmap=qemu:dirty-bitmap:{bitmap}' > + > + > +iotests.unarchive_sample_image('parallels-with-bitmap', disk) > + > +iotests.unarchive_sample_image('parallels-with-bitmap', '/work/mega') no-no-no, '/work/mega' is absolutely no way > + > + > +with qemu_nbd_popen('--read-only', f'--socket={nbd_sock}', > + f'--bitmap={bitmap}', '-f', iotests.imgfmt, disk): > + out = qemu_img_pipe('map', '--output=json', '--image-opts', nbd_opts) > + chunks = json.loads(out) > + cluster = 64 * 1024 > + > + log('dirty clusters (cluster size is 64K):') > + for c in chunks: > + assert c['start'] % cluster == 0 > + assert c['length'] % cluster == 0 > + if c['data']: > + continue > + > + a = c['start'] // cluster > + b = (c['start'] + c['length']) // cluster > + if b - a > 1: > + log(f'{a}-{b-1}') > + else: > + log(a) > diff --git a/tests/qemu-iotests/tests/parallels-read-bitmap.out b/tests/qemu-iotests/tests/parallels-read-bitmap.out > new file mode 100644 > index 0000000000..e8f6bc9e96 > --- /dev/null > +++ b/tests/qemu-iotests/tests/parallels-read-bitmap.out > @@ -0,0 +1,6 @@ > +Start NBD server > +dirty clusters (cluster size is 64K): > +5-6 > +10-12 > +30 > +Kill NBD server
19.02.2021 14:56, Denis V. Lunev wrote: > On 2/16/21 7:45 PM, Vladimir Sementsov-Ogievskiy wrote: >> Test support for reading bitmap from parallels image format. >> parallels-with-bitmap.bz2 is generated on Virtuozzo by >> parallels-with-bitmap.sh >> >> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> >> --- >> .../sample_images/parallels-with-bitmap.bz2 | Bin 0 -> 203 bytes >> .../sample_images/parallels-with-bitmap.sh | 33 ++++++++++ >> .../qemu-iotests/tests/parallels-read-bitmap | 57 ++++++++++++++++++ >> .../tests/parallels-read-bitmap.out | 6 ++ >> 4 files changed, 96 insertions(+) >> create mode 100644 tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2 >> create mode 100755 tests/qemu-iotests/sample_images/parallels-with-bitmap.sh >> create mode 100755 tests/qemu-iotests/tests/parallels-read-bitmap >> create mode 100644 tests/qemu-iotests/tests/parallels-read-bitmap.out >> >> diff --git a/tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2 b/tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2 >> new file mode 100644 >> index 0000000000000000000000000000000000000000..54892fd4d01bf743d395bd4f3d896494146ab5a9 >> GIT binary patch >> literal 203 >> zcmV;+05tzXT4*^jL0KkKS@=;0bpT+Hf7|^?Km<xfFyKQJ7=Y^F-%vt;00~Ysa6|-= >> zk&7Szk`SoS002EkfMftPG<ipnsiCK}K_sNmm}me3FiZr%Oaf_u5F8kD;mB_~cxD-r >> z5P$(X{&Tq5C`<xK02D?NNdN+t$~z$m00O|zFh^ynq*yaCtkn+NZzWom<#OEoF`?zb >> zv(i3x^K~wt!aLPcRBP+PckUsIh6*LgjYSh0`}#7hMC9NR5D)+W0d&8Mxgwk>NPH-R >> Fx`3oHQ9u9y >> >> literal 0 >> HcmV?d00001 >> >> diff --git a/tests/qemu-iotests/sample_images/parallels-with-bitmap.sh b/tests/qemu-iotests/sample_images/parallels-with-bitmap.sh >> new file mode 100755 >> index 0000000000..e4a1d71277 >> --- /dev/null >> +++ b/tests/qemu-iotests/sample_images/parallels-with-bitmap.sh >> @@ -0,0 +1,33 @@ > do we need Copyright notice here? Will add > I am unsure that this script is to be > acceptable in QEMU repo. Anyway, it looks fine :) Yes, it requires some proprietary tools, not available for most of developers.. On the other hand, I should document somehow, how did I create the image (at least for future me). I can do it in a commit message, but I think better is just add a script, it will not hurt. > > >> +#!/bin/bash >> + >> +CT=parallels-with-bitmap-ct >> +DIR=$PWD/parallels-with-bitmap-dir >> +IMG=$DIR/root.hds >> +XML=$DIR/DiskDescriptor.xml >> +TARGET=parallels-with-bitmap.bz2 >> + >> +rm -rf $DIR >> + >> +prlctl create $CT --vmtype ct >> +prlctl set $CT --device-add hdd --image $DIR --recreate --size 2G >> + >> +# cleanup the image >> +qemu-img create -f parallels $IMG 64G >> + >> +# create bitmap >> +prlctl backup $CT >> + >> +prlctl set $CT --device-del hdd1 >> +prlctl destroy $CT >> + >> +dev=$(ploop mount $XML | sed -n 's/^Adding delta dev=\(\/dev\/ploop[0-9]\+\).*/\1/p') >> +dd if=/dev/zero of=$dev bs=64K seek=5 count=2 oflag=direct >> +dd if=/dev/zero of=$dev bs=64K seek=30 count=1 oflag=direct >> +dd if=/dev/zero of=$dev bs=64K seek=10 count=3 oflag=direct >> +ploop umount $XML # bitmap name will be in the output >> + >> +bzip2 -z $IMG >> + >> +mv $IMG.bz2 $TARGET >> + >> +rm -rf $DIR >> diff --git a/tests/qemu-iotests/tests/parallels-read-bitmap b/tests/qemu-iotests/tests/parallels-read-bitmap >> new file mode 100755 >> index 0000000000..b50b79f509 >> --- /dev/null >> +++ b/tests/qemu-iotests/tests/parallels-read-bitmap >> @@ -0,0 +1,57 @@ >> +#!/usr/bin/env python3 >> +# >> +# Test parallels load bitmap >> +# >> +# Copyright (c) 2021 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 json >> +import iotests >> +from iotests import qemu_nbd_popen, qemu_img_pipe, log, file_path >> + >> +iotests.script_initialize(supported_fmts=['parallels']) >> + >> +nbd_sock = file_path('nbd-sock', base_dir=iotests.sock_dir) >> +disk = iotests.file_path('disk') >> +bitmap = 'e4f2eed0-37fe-4539-b50b-85d2e7fd235f' >> +nbd_opts = f'driver=nbd,server.type=unix,server.path={nbd_sock}' \ >> + f',x-dirty-bitmap=qemu:dirty-bitmap:{bitmap}' >> + >> + >> +iotests.unarchive_sample_image('parallels-with-bitmap', disk) >> + >> +iotests.unarchive_sample_image('parallels-with-bitmap', '/work/mega') > no-no-no, '/work/mega' is absolutely no way > Oops) > >> + >> + >> +with qemu_nbd_popen('--read-only', f'--socket={nbd_sock}', >> + f'--bitmap={bitmap}', '-f', iotests.imgfmt, disk): >> + out = qemu_img_pipe('map', '--output=json', '--image-opts', nbd_opts) >> + chunks = json.loads(out) >> + cluster = 64 * 1024 >> + >> + log('dirty clusters (cluster size is 64K):') >> + for c in chunks: >> + assert c['start'] % cluster == 0 >> + assert c['length'] % cluster == 0 >> + if c['data']: >> + continue >> + >> + a = c['start'] // cluster >> + b = (c['start'] + c['length']) // cluster >> + if b - a > 1: >> + log(f'{a}-{b-1}') >> + else: >> + log(a) >> diff --git a/tests/qemu-iotests/tests/parallels-read-bitmap.out b/tests/qemu-iotests/tests/parallels-read-bitmap.out >> new file mode 100644 >> index 0000000000..e8f6bc9e96 >> --- /dev/null >> +++ b/tests/qemu-iotests/tests/parallels-read-bitmap.out >> @@ -0,0 +1,6 @@ >> +Start NBD server >> +dirty clusters (cluster size is 64K): >> +5-6 >> +10-12 >> +30 >> +Kill NBD server >
diff --git a/tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2 b/tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..54892fd4d01bf743d395bd4f3d896494146ab5a9 GIT binary patch literal 203 zcmV;+05tzXT4*^jL0KkKS@=;0bpT+Hf7|^?Km<xfFyKQJ7=Y^F-%vt;00~Ysa6|-= zk&7Szk`SoS002EkfMftPG<ipnsiCK}K_sNmm}me3FiZr%Oaf_u5F8kD;mB_~cxD-r z5P$(X{&Tq5C`<xK02D?NNdN+t$~z$m00O|zFh^ynq*yaCtkn+NZzWom<#OEoF`?zb zv(i3x^K~wt!aLPcRBP+PckUsIh6*LgjYSh0`}#7hMC9NR5D)+W0d&8Mxgwk>NPH-R Fx`3oHQ9u9y literal 0 HcmV?d00001 diff --git a/tests/qemu-iotests/sample_images/parallels-with-bitmap.sh b/tests/qemu-iotests/sample_images/parallels-with-bitmap.sh new file mode 100755 index 0000000000..e4a1d71277 --- /dev/null +++ b/tests/qemu-iotests/sample_images/parallels-with-bitmap.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +CT=parallels-with-bitmap-ct +DIR=$PWD/parallels-with-bitmap-dir +IMG=$DIR/root.hds +XML=$DIR/DiskDescriptor.xml +TARGET=parallels-with-bitmap.bz2 + +rm -rf $DIR + +prlctl create $CT --vmtype ct +prlctl set $CT --device-add hdd --image $DIR --recreate --size 2G + +# cleanup the image +qemu-img create -f parallels $IMG 64G + +# create bitmap +prlctl backup $CT + +prlctl set $CT --device-del hdd1 +prlctl destroy $CT + +dev=$(ploop mount $XML | sed -n 's/^Adding delta dev=\(\/dev\/ploop[0-9]\+\).*/\1/p') +dd if=/dev/zero of=$dev bs=64K seek=5 count=2 oflag=direct +dd if=/dev/zero of=$dev bs=64K seek=30 count=1 oflag=direct +dd if=/dev/zero of=$dev bs=64K seek=10 count=3 oflag=direct +ploop umount $XML # bitmap name will be in the output + +bzip2 -z $IMG + +mv $IMG.bz2 $TARGET + +rm -rf $DIR diff --git a/tests/qemu-iotests/tests/parallels-read-bitmap b/tests/qemu-iotests/tests/parallels-read-bitmap new file mode 100755 index 0000000000..b50b79f509 --- /dev/null +++ b/tests/qemu-iotests/tests/parallels-read-bitmap @@ -0,0 +1,57 @@ +#!/usr/bin/env python3 +# +# Test parallels load bitmap +# +# Copyright (c) 2021 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 json +import iotests +from iotests import qemu_nbd_popen, qemu_img_pipe, log, file_path + +iotests.script_initialize(supported_fmts=['parallels']) + +nbd_sock = file_path('nbd-sock', base_dir=iotests.sock_dir) +disk = iotests.file_path('disk') +bitmap = 'e4f2eed0-37fe-4539-b50b-85d2e7fd235f' +nbd_opts = f'driver=nbd,server.type=unix,server.path={nbd_sock}' \ + f',x-dirty-bitmap=qemu:dirty-bitmap:{bitmap}' + + +iotests.unarchive_sample_image('parallels-with-bitmap', disk) + +iotests.unarchive_sample_image('parallels-with-bitmap', '/work/mega') + + +with qemu_nbd_popen('--read-only', f'--socket={nbd_sock}', + f'--bitmap={bitmap}', '-f', iotests.imgfmt, disk): + out = qemu_img_pipe('map', '--output=json', '--image-opts', nbd_opts) + chunks = json.loads(out) + cluster = 64 * 1024 + + log('dirty clusters (cluster size is 64K):') + for c in chunks: + assert c['start'] % cluster == 0 + assert c['length'] % cluster == 0 + if c['data']: + continue + + a = c['start'] // cluster + b = (c['start'] + c['length']) // cluster + if b - a > 1: + log(f'{a}-{b-1}') + else: + log(a) diff --git a/tests/qemu-iotests/tests/parallels-read-bitmap.out b/tests/qemu-iotests/tests/parallels-read-bitmap.out new file mode 100644 index 0000000000..e8f6bc9e96 --- /dev/null +++ b/tests/qemu-iotests/tests/parallels-read-bitmap.out @@ -0,0 +1,6 @@ +Start NBD server +dirty clusters (cluster size is 64K): +5-6 +10-12 +30 +Kill NBD server
Test support for reading bitmap from parallels image format. parallels-with-bitmap.bz2 is generated on Virtuozzo by parallels-with-bitmap.sh Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- .../sample_images/parallels-with-bitmap.bz2 | Bin 0 -> 203 bytes .../sample_images/parallels-with-bitmap.sh | 33 ++++++++++ .../qemu-iotests/tests/parallels-read-bitmap | 57 ++++++++++++++++++ .../tests/parallels-read-bitmap.out | 6 ++ 4 files changed, 96 insertions(+) create mode 100644 tests/qemu-iotests/sample_images/parallels-with-bitmap.bz2 create mode 100755 tests/qemu-iotests/sample_images/parallels-with-bitmap.sh create mode 100755 tests/qemu-iotests/tests/parallels-read-bitmap create mode 100644 tests/qemu-iotests/tests/parallels-read-bitmap.out