From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 23/24] qemu-iotests: add shrinking image test
Date: Tue, 26 Sep 2017 16:21:32 +0200 [thread overview]
Message-ID: <20170926142133.2498-24-kwolf@redhat.com> (raw)
In-Reply-To: <20170926142133.2498-1-kwolf@redhat.com>
From: Pavel Butsykin <pbutsykin@virtuozzo.com>
Signed-off-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20170918124230.8152-5-pbutsykin@virtuozzo.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/163 | 170 +++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/163.out | 5 ++
tests/qemu-iotests/group | 1 +
3 files changed, 176 insertions(+)
create mode 100644 tests/qemu-iotests/163
create mode 100644 tests/qemu-iotests/163.out
diff --git a/tests/qemu-iotests/163 b/tests/qemu-iotests/163
new file mode 100644
index 0000000000..403842354e
--- /dev/null
+++ b/tests/qemu-iotests/163
@@ -0,0 +1,170 @@
+#!/usr/bin/env python
+#
+# Tests for shrinking images
+#
+# Copyright (c) 2016-2017 Parallels 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 os, random, iotests, struct, qcow2
+from iotests import qemu_img, qemu_io, image_size
+
+test_img = os.path.join(iotests.test_dir, 'test.img')
+check_img = os.path.join(iotests.test_dir, 'check.img')
+
+def size_to_int(str):
+ suff = ['B', 'K', 'M', 'G', 'T']
+ return int(str[:-1]) * 1024**suff.index(str[-1:])
+
+class ShrinkBaseClass(iotests.QMPTestCase):
+ image_len = '128M'
+ shrink_size = '10M'
+ chunk_size = '16M'
+ refcount_bits = '16'
+
+ def __qcow2_check(self, filename):
+ entry_bits = 3
+ entry_size = 1 << entry_bits
+ l1_mask = 0x00fffffffffffe00
+ div_roundup = lambda n, d: (n + d - 1) / d
+
+ def split_by_n(data, n):
+ for x in xrange(0, len(data), n):
+ yield struct.unpack('>Q', data[x:x + n])[0] & l1_mask
+
+ def check_l1_table(h, l1_data):
+ l1_list = list(split_by_n(l1_data, entry_size))
+ real_l1_size = div_roundup(h.size,
+ 1 << (h.cluster_bits*2 - entry_size))
+ used, unused = l1_list[:real_l1_size], l1_list[real_l1_size:]
+
+ self.assertTrue(len(used) != 0, "Verifying l1 table content")
+ self.assertFalse(any(unused), "Verifying l1 table content")
+
+ def check_reftable(fd, h, reftable):
+ for offset in split_by_n(reftable, entry_size):
+ if offset != 0:
+ fd.seek(offset)
+ cluster = fd.read(1 << h.cluster_bits)
+ self.assertTrue(any(cluster), "Verifying reftable content")
+
+ with open(filename, "rb") as fd:
+ h = qcow2.QcowHeader(fd)
+
+ fd.seek(h.l1_table_offset)
+ l1_table = fd.read(h.l1_size << entry_bits)
+
+ fd.seek(h.refcount_table_offset)
+ reftable = fd.read(h.refcount_table_clusters << h.cluster_bits)
+
+ check_l1_table(h, l1_table)
+ check_reftable(fd, h, reftable)
+
+ def __raw_check(self, filename):
+ pass
+
+ image_check = {
+ 'qcow2' : __qcow2_check,
+ 'raw' : __raw_check
+ }
+
+ def setUp(self):
+ if iotests.imgfmt == 'raw':
+ qemu_img('create', '-f', iotests.imgfmt, test_img, self.image_len)
+ qemu_img('create', '-f', iotests.imgfmt, check_img,
+ self.shrink_size)
+ else:
+ qemu_img('create', '-f', iotests.imgfmt,
+ '-o', 'cluster_size=' + self.cluster_size +
+ ',refcount_bits=' + self.refcount_bits,
+ test_img, self.image_len)
+ qemu_img('create', '-f', iotests.imgfmt,
+ '-o', 'cluster_size=%s'% self.cluster_size,
+ check_img, self.shrink_size)
+ qemu_io('-c', 'write -P 0xff 0 ' + self.shrink_size, check_img)
+
+ def tearDown(self):
+ os.remove(test_img)
+ os.remove(check_img)
+
+ def image_verify(self):
+ self.assertEqual(image_size(test_img), image_size(check_img),
+ "Verifying image size")
+ self.image_check[iotests.imgfmt](self, test_img)
+
+ if iotests.imgfmt == 'raw':
+ return
+ self.assertEqual(qemu_img('check', test_img), 0,
+ "Verifying image corruption")
+
+ def test_empty_image(self):
+ qemu_img('resize', '-f', iotests.imgfmt, '--shrink', test_img,
+ self.shrink_size)
+
+ self.assertEqual(
+ qemu_io('-c', 'read -P 0x00 %s'%self.shrink_size, test_img),
+ qemu_io('-c', 'read -P 0x00 %s'%self.shrink_size, check_img),
+ "Verifying image content")
+
+ self.image_verify()
+
+ def test_sequential_write(self):
+ for offs in range(0, size_to_int(self.image_len),
+ size_to_int(self.chunk_size)):
+ qemu_io('-c', 'write -P 0xff %d %s' % (offs, self.chunk_size),
+ test_img)
+
+ qemu_img('resize', '-f', iotests.imgfmt, '--shrink', test_img,
+ self.shrink_size)
+
+ self.assertEqual(qemu_img("compare", test_img, check_img), 0,
+ "Verifying image content")
+
+ self.image_verify()
+
+ def test_random_write(self):
+ offs_list = range(0, size_to_int(self.image_len),
+ size_to_int(self.chunk_size))
+ random.shuffle(offs_list)
+ for offs in offs_list:
+ qemu_io('-c', 'write -P 0xff %d %s' % (offs, self.chunk_size),
+ test_img)
+
+ qemu_img('resize', '-f', iotests.imgfmt, '--shrink', test_img,
+ self.shrink_size)
+
+ self.assertEqual(qemu_img("compare", test_img, check_img), 0,
+ "Verifying image content")
+
+ self.image_verify()
+
+class TestShrink512(ShrinkBaseClass):
+ image_len = '3M'
+ shrink_size = '1M'
+ chunk_size = '256K'
+ cluster_size = '512'
+ refcount_bits = '64'
+
+class TestShrink64K(ShrinkBaseClass):
+ cluster_size = '64K'
+
+class TestShrink1M(ShrinkBaseClass):
+ cluster_size = '1M'
+ refcount_bits = '1'
+
+ShrinkBaseClass = None
+
+if __name__ == '__main__':
+ iotests.main(supported_fmts=['raw', 'qcow2'])
diff --git a/tests/qemu-iotests/163.out b/tests/qemu-iotests/163.out
new file mode 100644
index 0000000000..dae404e278
--- /dev/null
+++ b/tests/qemu-iotests/163.out
@@ -0,0 +1,5 @@
+.........
+----------------------------------------------------------------------
+Ran 9 tests
+
+OK
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 108339cd03..cdccee319e 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -166,6 +166,7 @@
159 rw auto quick
160 rw auto quick
162 auto quick
+163 rw auto quick
165 rw auto quick
170 rw auto quick
171 rw auto quick
--
2.13.5
next prev parent reply other threads:[~2017-09-26 14:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-26 14:21 [Qemu-devel] [PULL 00/24] Block layer patches Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 01/24] qemu-iotests: Add missing -machine accel=qtest Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 02/24] qemu-img: Clarify about relative backing file options Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 03/24] file-posix: Clear out first sector in hdev_create Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 04/24] docs: add qemu-block-drivers(7) man page Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 05/24] iotests: use -ccw on s390x for 040, 139, and 182 Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 06/24] iotests: use -ccw on s390x for 051 Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 07/24] iotests: use virtio aliases for 067 Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 08/24] iotests: Print full path of bad output if mismatch Kevin Wolf
2017-09-26 14:56 ` Eric Blake
2017-09-26 15:25 ` Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 09/24] throttle: Assert that bkt->max is valid in throttle_compute_wait() Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 10/24] block/throttle-groups.c: allocate RestartData on the heap Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 11/24] block: Clean up some bad code in the vvfat driver Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 12/24] qemu-io: Drop write permissions before read-only reopen Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 13/24] block: Add reopen_queue to bdrv_child_perm() Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 14/24] block: Add reopen queue to bdrv_check_perm() Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 15/24] block: Base permissions on rw state after reopen Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 16/24] block: reopen: Queue children after their parents Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 17/24] block: Fix permissions after bdrv_reopen() Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 18/24] qemu-iotests: Test change-backing-file command Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 19/24] iotests: fix 181: enable postcopy-ram capability on target Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 20/24] qemu-img: add --shrink flag for resize Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 21/24] qcow2: add qcow2_cache_discard Kevin Wolf
2017-09-26 14:21 ` [Qemu-devel] [PULL 22/24] qcow2: add shrink image support Kevin Wolf
2017-09-26 14:21 ` Kevin Wolf [this message]
2017-09-26 14:21 ` [Qemu-devel] [PULL 24/24] block/qcow2-bitmap: fix use of uninitialized pointer Kevin Wolf
2017-09-27 17:20 ` [Qemu-devel] [PULL 00/24] Block layer patches Peter Maydell
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=20170926142133.2498-24-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).