From: John Snow <jsnow@redhat.com>
To: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
qemu-devel@nongnu.org, qemu-block@nongnu.org
Cc: kwolf@redhat.com, fam@euphon.net, den@virtuozzo.com,
armbru@redhat.com, mreitz@redhat.com
Subject: Re: [Qemu-devel] [PATCH v2 2/2] iotests: test external snapshot with bitmap copying
Date: Fri, 17 May 2019 21:31:55 -0400 [thread overview]
Message-ID: <25aed11e-8772-97c8-152b-2a8333e7253f@redhat.com> (raw)
In-Reply-To: <20190517152111.206494-3-vsementsov@virtuozzo.com>
On 5/17/19 11:21 AM, Vladimir Sementsov-Ogievskiy wrote:
> This test shows that external snapshots and incremental backups are
> friends.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
> tests/qemu-iotests/254 | 52 ++++++++++++++++++++++++++++++++++++++
> tests/qemu-iotests/254.out | 52 ++++++++++++++++++++++++++++++++++++++
> tests/qemu-iotests/group | 1 +
> 3 files changed, 105 insertions(+)
> create mode 100755 tests/qemu-iotests/254
> create mode 100644 tests/qemu-iotests/254.out
>
> diff --git a/tests/qemu-iotests/254 b/tests/qemu-iotests/254
> new file mode 100755
> index 0000000000..33cb80a512
> --- /dev/null
> +++ b/tests/qemu-iotests/254
> @@ -0,0 +1,52 @@
> +#!/usr/bin/env python
> +#
> +# Test external snapshot with bitmap copying.
> +#
> +# Copyright (c) 2019 Virtuozzo International GmbH. All rights reserved.
> +#
> +# 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 qemu_img_create, file_path, log
> +
> +disk, top = file_path('disk', 'top')
> +size = 1024 * 1024
> +
> +qemu_img_create('-f', iotests.imgfmt, disk, str(size))
> +
> +vm = iotests.VM().add_drive(disk, opts='node-name=base')
> +vm.launch()
> +
> +vm.qmp_log('block-dirty-bitmap-add', node='drive0', name='bitmap0')
> +
> +vm.hmp_qemu_io('drive0', 'write 0 512K')
> +
> +vm.qmp_log('transaction', indent=2, actions=[
> + {'type': 'blockdev-snapshot-sync',
> + 'data': {'device': 'drive0', 'snapshot-file': top,
> + 'snapshot-node-name': 'snap'}},
> + {'type': 'block-dirty-bitmap-add',
> + 'data': {'node': 'snap', 'name': 'bitmap0'}},
> + {'type': 'block-dirty-bitmap-merge',
> + 'data': {'node': 'snap', 'target': 'bitmap0',
> + 'bitmaps': [{'node': 'base', 'name': 'bitmap0'}]}}
> +], filters=[iotests.filter_qmp_testfiles])
> +
> +result = vm.qmp('query-block')['return'][0]
> +log("query-block: device = {}, node-name = {}, dirty-bitmaps:".format(
> + result['device'], result['inserted']['node-name']))
> +log(result['dirty-bitmaps'], indent=2)
> +
> +vm.shutdown()
> diff --git a/tests/qemu-iotests/254.out b/tests/qemu-iotests/254.out
> new file mode 100644
> index 0000000000..d7394cf002
> --- /dev/null
> +++ b/tests/qemu-iotests/254.out
> @@ -0,0 +1,52 @@
> +{"execute": "block-dirty-bitmap-add", "arguments": {"name": "bitmap0", "node": "drive0"}}
> +{"return": {}}
> +{
> + "execute": "transaction",
> + "arguments": {
> + "actions": [
> + {
> + "data": {
> + "device": "drive0",
> + "snapshot-file": "TEST_DIR/PID-top",
> + "snapshot-node-name": "snap"
> + },
> + "type": "blockdev-snapshot-sync"
> + },
> + {
> + "data": {
> + "name": "bitmap0",
> + "node": "snap"
> + },
> + "type": "block-dirty-bitmap-add"
> + },
> + {
> + "data": {
> + "bitmaps": [
> + {
> + "name": "bitmap0",
> + "node": "base"
> + }
> + ],
> + "node": "snap",
> + "target": "bitmap0"
> + },
> + "type": "block-dirty-bitmap-merge"
> + }
> + ]
> + }
> +}
> +{
> + "return": {}
> +}
> +query-block: device = drive0, node-name = snap, dirty-bitmaps:
> +[
> + {
> + "busy": false,
> + "count": 524288,
> + "granularity": 65536,
> + "name": "bitmap0",
> + "persistent": false,
> + "recording": true,
> + "status": "active"
> + }
> +]
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index 00e474ab0a..5552d0153c 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -250,3 +250,4 @@
> 248 rw auto quick
> 249 rw auto quick
> 252 rw auto backing quick
> +254 rw auto backing quick
>
Reviewed-by: John Snow <jsnow@redhat.com>
We will eventually want something more rigorous in terms of a full
workflow, but for the purposes of testing cross-node merge I think this
demonstrates it fine.
I'll stage these shortly.
--js
next prev parent reply other threads:[~2019-05-18 1:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-17 15:21 [Qemu-devel] [PATCH v2 0/2] bitmaps: merge bitmaps from different nodes Vladimir Sementsov-Ogievskiy
2019-05-17 15:21 ` [Qemu-devel] [PATCH v2 1/2] qapi: support external bitmaps in block-dirty-bitmap-merge Vladimir Sementsov-Ogievskiy
2019-05-17 22:45 ` John Snow
2019-05-20 15:23 ` Eric Blake
2019-05-17 15:21 ` [Qemu-devel] [PATCH v2 2/2] iotests: test external snapshot with bitmap copying Vladimir Sementsov-Ogievskiy
2019-05-18 1:31 ` John Snow [this message]
2019-05-20 7:47 ` Vladimir Sementsov-Ogievskiy
2019-05-20 22:50 ` John Snow
2019-06-05 14:51 ` [Qemu-devel] [Qemu-block] " Max Reitz
2019-06-05 15:08 ` 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=25aed11e-8772-97c8-152b-2a8333e7253f@redhat.com \
--to=jsnow@redhat.com \
--cc=armbru@redhat.com \
--cc=den@virtuozzo.com \
--cc=fam@euphon.net \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.