Re: [PATCH v2 2/2] iotests: add 269 to check maximum of bitmaps in qcow2

2019-11-16 Thread Vladimir Sementsov-Ogievskiy
25.10.2019 16:12, Max Reitz wrote:
> On 14.10.19 13:51, Vladimir Sementsov-Ogievskiy wrote:
>> Check that it's impossible to create more persistent bitmaps than qcow2
>> supports.
>>
>> Signed-off-by: Vladimir Sementsov-Ogievskiy 
>> ---
>>   tests/qemu-iotests/269 | 47 ++
>>   tests/qemu-iotests/269.out |  3 +++
>>   tests/qemu-iotests/group   |  1 +
>>   3 files changed, 51 insertions(+)
>>   create mode 100755 tests/qemu-iotests/269
>>   create mode 100644 tests/qemu-iotests/269.out
> 
> Is there no way to make this test any faster, e.g. by creating like
> 65534 bitmaps with dd and a binary blob?  (Similarly to what I do in
> “iotests: Test qcow2's snapshot table handling”)

Seems, that's not simple.. Each bitmap should have personal name and
bitmap table..

Let's merge only patch 01 and forget about this one.

> 
> This is such an edge case, but running the test took 3:46 min before
> patch 1 (which I already find much too long), and 8:13 min afterwards
> (on my machine).
> 
> (To be honest, if we take this test as-is, I’m probably just never going
> to run it.)
> 
> Max
> 


-- 
Best regards,
Vladimir


Re: [PATCH v2 2/2] iotests: add 269 to check maximum of bitmaps in qcow2

2019-10-25 Thread Max Reitz
On 14.10.19 13:51, Vladimir Sementsov-Ogievskiy wrote:
> Check that it's impossible to create more persistent bitmaps than qcow2
> supports.
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy 
> ---
>  tests/qemu-iotests/269 | 47 ++
>  tests/qemu-iotests/269.out |  3 +++
>  tests/qemu-iotests/group   |  1 +
>  3 files changed, 51 insertions(+)
>  create mode 100755 tests/qemu-iotests/269
>  create mode 100644 tests/qemu-iotests/269.out

Is there no way to make this test any faster, e.g. by creating like
65534 bitmaps with dd and a binary blob?  (Similarly to what I do in
“iotests: Test qcow2's snapshot table handling”)

This is such an edge case, but running the test took 3:46 min before
patch 1 (which I already find much too long), and 8:13 min afterwards
(on my machine).

(To be honest, if we take this test as-is, I’m probably just never going
to run it.)

Max



signature.asc
Description: OpenPGP digital signature


[PATCH v2 2/2] iotests: add 269 to check maximum of bitmaps in qcow2

2019-10-14 Thread Vladimir Sementsov-Ogievskiy
Check that it's impossible to create more persistent bitmaps than qcow2
supports.

Signed-off-by: Vladimir Sementsov-Ogievskiy 
---
 tests/qemu-iotests/269 | 47 ++
 tests/qemu-iotests/269.out |  3 +++
 tests/qemu-iotests/group   |  1 +
 3 files changed, 51 insertions(+)
 create mode 100755 tests/qemu-iotests/269
 create mode 100644 tests/qemu-iotests/269.out

diff --git a/tests/qemu-iotests/269 b/tests/qemu-iotests/269
new file mode 100755
index 00..cf14d519ee
--- /dev/null
+++ b/tests/qemu-iotests/269
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+#
+# Test exceeding dirty bitmaps maximum amount in qcow2 image
+#
+# Copyright (c) 2019 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 .
+#
+
+import iotests
+from iotests import qemu_img_create, file_path, log, filter_qmp_event
+
+iotests.verify_image_format(supported_fmts=['qcow2'])
+
+img = file_path('img')
+size = 64 * 1024
+
+qemu_img_create('-f', iotests.imgfmt, img, str(size))
+vm = iotests.VM().add_drive(img)
+vm.launch()
+
+# Look at block/qcow2.h
+QCOW2_MAX_BITMAPS = 65535
+
+for i in range(QCOW2_MAX_BITMAPS):
+result = vm.qmp('block-dirty-bitmap-add', node='drive0',
+name='bitmap{}'.format(i), persistent=True)
+assert result['return'] == {}
+
+log("{} persistent bitmap already created, " \
+"let's try to create one more".format(QCOW2_MAX_BITMAPS))
+
+vm.qmp_log('block-dirty-bitmap-add', node='drive0',
+   name='bitmap{}'.format(QCOW2_MAX_BITMAPS), persistent=True)
+
+vm.shutdown()
diff --git a/tests/qemu-iotests/269.out b/tests/qemu-iotests/269.out
new file mode 100644
index 00..bcfa616a2b
--- /dev/null
+++ b/tests/qemu-iotests/269.out
@@ -0,0 +1,3 @@
+65535 persistent bitmap already created, let's try to create one more
+{"execute": "block-dirty-bitmap-add", "arguments": {"name": "bitmap65535", 
"node": "drive0", "persistent": true}}
+{"error": {"class": "GenericError", "desc": "Can't make bitmap 'bitmap65535' 
persistent in 'drive0': Maximum number of persistent bitmaps is already 
reached"}}
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 0c1e5ef414..fe8274a204 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -279,3 +279,4 @@
 265 rw auto quick
 266 rw quick
 267 rw auto quick snapshot
+269
-- 
2.21.0