From: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com>
Message-id: 20190927122355.7344-8-vsementsov(a)virtuozzo.com
[Maintainer edit: removed 260 from auto group per Peter Maydell. --js]
Signed-off-by: John Snow <jsnow(a)redhat.com>
---
tests/qemu-iotests/260 | 89 ++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/260.out | 52 ++++++++++++++++++++++
tests/qemu-iotests/group | 1 +
3 files changed, 142 insertions(+)
create mode 100755 tests/qemu-iotests/260
create mode 100644 tests/qemu-iotests/260.out
diff --git a/tests/qemu-iotests/260 b/tests/qemu-iotests/260
new file mode 100755
index 0000000000..4f6082c9d2
--- /dev/null
+++ b/tests/qemu-iotests/260
@@ -0,0 +1,89 @@
+#!/usr/bin/env python
+#
+# Tests for temporary external snapshot when we have bitmaps.
+#
+# 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, filter_qmp_event
+
+iotests.verify_image_format(supported_fmts=['qcow2'])
+
+base, top = file_path('base', 'top')
+size = 64 * 1024 * 3
+
+
+def print_bitmap(msg, vm):
+ result = vm.qmp('query-block')['return'][0]
+ if 'dirty-bitmaps' in result:
+ bitmap = result['dirty-bitmaps'][0]
+ log('{}: name={} dirty-clusters={}'.format(msg, bitmap['name'],
+ bitmap['count'] // 64 // 1024))
+ else:
+ log(msg + ': not found')
+
+
+def test(persistent, restart):
+ assert persistent or not restart
+ log("\nTestcase {}persistent {} restart\n".format(
+ '' if persistent else 'non-', 'with' if restart else
'without'))
+
+ qemu_img_create('-f', iotests.imgfmt, base, str(size))
+
+ vm = iotests.VM().add_drive(base)
+ vm.launch()
+
+ vm.qmp_log('block-dirty-bitmap-add', node='drive0',
name='bitmap0',
+ persistent=persistent)
+ vm.hmp_qemu_io('drive0', 'write 0 64K')
+ print_bitmap('initial bitmap', vm)
+
+ vm.qmp_log('blockdev-snapshot-sync', device='drive0',
snapshot_file=top,
+ format=iotests.imgfmt, filters=[iotests.filter_qmp_testfiles])
+ vm.hmp_qemu_io('drive0', 'write 64K 512')
+ print_bitmap('check that no bitmaps are in snapshot', vm)
+
+ if restart:
+ log("... Restart ...")
+ vm.shutdown()
+ vm = iotests.VM().add_drive(top)
+ vm.launch()
+
+ vm.qmp_log('block-commit', device='drive0', top=top,
+ filters=[iotests.filter_qmp_testfiles])
+ ev = vm.events_wait((('BLOCK_JOB_READY', None),
+ ('BLOCK_JOB_COMPLETED', None)))
+ log(filter_qmp_event(ev))
+ if (ev['event'] == 'BLOCK_JOB_COMPLETED'):
+ vm.shutdown()
+ log(vm.get_log())
+ exit()
+
+ vm.qmp_log('block-job-complete', device='drive0')
+ ev = vm.event_wait('BLOCK_JOB_COMPLETED')
+ log(filter_qmp_event(ev))
+ print_bitmap('check bitmap after commit', vm)
+
+ vm.hmp_qemu_io('drive0', 'write 128K 64K')
+ print_bitmap('check updated bitmap', vm)
+
+ vm.shutdown()
+
+
+test(persistent=False, restart=False)
+test(persistent=True, restart=False)
+test(persistent=True, restart=True)
diff --git a/tests/qemu-iotests/260.out b/tests/qemu-iotests/260.out
new file mode 100644
index 0000000000..2f0d98d036
--- /dev/null
+++ b/tests/qemu-iotests/260.out
@@ -0,0 +1,52 @@
+
+Testcase non-persistent without restart
+
+{"execute": "block-dirty-bitmap-add", "arguments":
{"name": "bitmap0", "node": "drive0",
"persistent": false}}
+{"return": {}}
+initial bitmap: name=bitmap0 dirty-clusters=1
+{"execute": "blockdev-snapshot-sync", "arguments":
{"device": "drive0", "format": "qcow2",
"snapshot-file": "TEST_DIR/PID-top"}}
+{"return": {}}
+check that no bitmaps are in snapshot: not found
+{"execute": "block-commit", "arguments":
{"device": "drive0", "top": "TEST_DIR/PID-top"}}
+{"return": {}}
+{"data": {"device": "drive0", "len": 65536,
"offset": 65536, "speed": 0, "type": "commit"},
"event": "BLOCK_JOB_READY", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"execute": "block-job-complete", "arguments":
{"device": "drive0"}}
+{"return": {}}
+{"data": {"device": "drive0", "len": 65536,
"offset": 65536, "speed": 0, "type": "commit"},
"event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+check bitmap after commit: name=bitmap0 dirty-clusters=2
+check updated bitmap: name=bitmap0 dirty-clusters=3
+
+Testcase persistent without restart
+
+{"execute": "block-dirty-bitmap-add", "arguments":
{"name": "bitmap0", "node": "drive0",
"persistent": true}}
+{"return": {}}
+initial bitmap: name=bitmap0 dirty-clusters=1
+{"execute": "blockdev-snapshot-sync", "arguments":
{"device": "drive0", "format": "qcow2",
"snapshot-file": "TEST_DIR/PID-top"}}
+{"return": {}}
+check that no bitmaps are in snapshot: not found
+{"execute": "block-commit", "arguments":
{"device": "drive0", "top": "TEST_DIR/PID-top"}}
+{"return": {}}
+{"data": {"device": "drive0", "len": 65536,
"offset": 65536, "speed": 0, "type": "commit"},
"event": "BLOCK_JOB_READY", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"execute": "block-job-complete", "arguments":
{"device": "drive0"}}
+{"return": {}}
+{"data": {"device": "drive0", "len": 65536,
"offset": 65536, "speed": 0, "type": "commit"},
"event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+check bitmap after commit: name=bitmap0 dirty-clusters=2
+check updated bitmap: name=bitmap0 dirty-clusters=3
+
+Testcase persistent with restart
+
+{"execute": "block-dirty-bitmap-add", "arguments":
{"name": "bitmap0", "node": "drive0",
"persistent": true}}
+{"return": {}}
+initial bitmap: name=bitmap0 dirty-clusters=1
+{"execute": "blockdev-snapshot-sync", "arguments":
{"device": "drive0", "format": "qcow2",
"snapshot-file": "TEST_DIR/PID-top"}}
+{"return": {}}
+check that no bitmaps are in snapshot: not found
+... Restart ...
+{"execute": "block-commit", "arguments":
{"device": "drive0", "top": "TEST_DIR/PID-top"}}
+{"return": {}}
+{"data": {"device": "drive0", "len": 65536,
"offset": 65536, "speed": 0, "type": "commit"},
"event": "BLOCK_JOB_READY", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+{"execute": "block-job-complete", "arguments":
{"device": "drive0"}}
+{"return": {}}
+{"data": {"device": "drive0", "len": 65536,
"offset": 65536, "speed": 0, "type": "commit"},
"event": "BLOCK_JOB_COMPLETED", "timestamp":
{"microseconds": "USECS", "seconds": "SECS"}}
+check bitmap after commit: name=bitmap0 dirty-clusters=2
+check updated bitmap: name=bitmap0 dirty-clusters=3
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 7dac79a783..a73df279e5 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -273,6 +273,7 @@
256 rw quick
257 rw
258 rw quick
+260 rw quick
262 rw quick migration
263 rw quick
265 rw auto quick
--
2.21.0