iotests: fix 254 for qcow (1)
PATCH 1/1 iotests: fix 254 for qcow (1)
Qcow default cluster size is 4k, but default format of created overlay image on snapshot operation is qcow2 with it's default cluster of 64k.
This leads to block-dirty-bitmap-merge fail when test run for qcow format, as it can't merge bitmaps with different granularities. Let's fix it by specifying strict granularity.
--- tests/qemu-iotests/254 | 5 +++-- tests/qemu-iotests/254.out | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)
tests/qemu-iotests/254 +3 -2
@@ -29,7 +29,8 @@ 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.qmp_log('block-dirty-bitmap-add', node='drive0', name='bitmap0', + granularity=65536) vm.hmp_qemu_io('drive0', 'write 0 512K')
@@ -38,7 +39,7 @@ vm.qmp_log('transaction', indent=2, actions=[ 'data': {'device': 'drive0', 'snapshot-file': top, 'snapshot-node-name': 'snap'}}, {'type': 'block-dirty-bitmap-add', - 'data': {'node': 'snap', 'name': 'bitmap0'}}, + 'data': {'node': 'snap', 'name': 'bitmap0', 'granularity': 65536}}, {'type': 'block-dirty-bitmap-merge', 'data': {'node': 'snap', 'target': 'bitmap0', 'bitmaps': [{'node': 'base', 'name': 'bitmap0'}]}}
tests/qemu-iotests/254.out +2 -1
@@ -1,4 +1,4 @@ -{"execute": "block-dirty-bitmap-add", "arguments": {"name": "bitmap0", "node": "drive0"}} +{"execute": "block-dirty-bitmap-add", "arguments": {"granularity": 65536, "name": "bitmap0", "node": "drive0"}} {"return": {}} { "execute": "transaction",
@@ -14,6 +14,7 @@ }, { "data": { + "granularity": 65536, "name": "bitmap0", "node": "snap" },
Signature · 1 line
2.18.0
Quoted 2 lines · Vladimir Sementsov-Ogievskiy
Qcow default cluster size is 4k, but default format of created overlay image on snapshot operation is qcow2 with it's default cluster of 64k.
Then I wonder why we run this test even for anything but qcow2.
I forgot to mention that this test also fails for all image formats that do not support image creation. So we need some form of iotests.verify_image_format() anyway. If half of this test requires qcow2, and the other half does not really care about the image format, then why not just restrict it to qcow2 altogether.
(Or restrict it to all formats that support backing files, and then explicitly specify the format when creating the snapshot?)
Max
Quoted 53 lines
This leads to block-dirty-bitmap-merge fail when test run for qcow format, as it can't merge bitmaps with different granularities. Let's fix it by specifying strict granularity.
Reported-by Max Reitz <[email protected]>Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/254 | 5 +++-- tests/qemu-iotests/254.out | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)tests/qemu-iotests/254 +3
-2@@ -29,7 +29,8 @@ 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.qmp_log('block-dirty-bitmap-add', node='drive0', name='bitmap0', + granularity=65536) vm.hmp_qemu_io('drive0', 'write 0 512K')@@ -38,7 +39,7 @@ vm.qmp_log('transaction', indent=2, actions=[ 'data': {'device': 'drive0', 'snapshot-file': top, 'snapshot-node-name': 'snap'}}, {'type': 'block-dirty-bitmap-add', - 'data': {'node': 'snap', 'name': 'bitmap0'}}, + 'data': {'node': 'snap', 'name': 'bitmap0', 'granularity': 65536}}, {'type': 'block-dirty-bitmap-merge', 'data': {'node': 'snap', 'target': 'bitmap0', 'bitmaps': [{'node': 'base', 'name': 'bitmap0'}]}}tests/qemu-iotests/254.out +2
-1@@ -1,4 +1,4 @@ -{"execute": "block-dirty-bitmap-add", "arguments": {"name": "bitmap0", "node": "drive0"}} +{"execute": "block-dirty-bitmap-add", "arguments": {"granularity": 65536, "name": "bitmap0", "node": "drive0"}} {"return": {}} { "execute": "transaction",@@ -14,6 +14,7 @@ }, { "data": { + "granularity": 65536, "name": "bitmap0", "node": "snap" },
Quoted 11 lines · Max Reitz
Quoted 2 lines · Vladimir Sementsov-Ogievskiy
Qcow default cluster size is 4k, but default format of created overlay image on snapshot operation is qcow2 with it's default cluster of 64k.
Then I wonder why we run this test even for anything but qcow2.
I forgot to mention that this test also fails for all image formats that do not support image creation. So we need some form of
iotests.verify_image_format()anyway. If half of this test requires qcow2, and the other half does not really care about the image format, then why not just restrict it to qcow2 altogether.
Hmm, then better restrict to qcow2 ofcourse.
Quoted 61 lines
(Or restrict it to all formats that support backing files, and then explicitly specify the format when creating the snapshot?)
Max
Quoted 53 lines
This leads to block-dirty-bitmap-merge fail when test run for qcow format, as it can't merge bitmaps with different granularities. Let's fix it by specifying strict granularity.
Reported-by Max Reitz <[email protected]>Signed-off-by Vladimir Sementsov-Ogievskiy <[email protected]>--- tests/qemu-iotests/254 | 5 +++-- tests/qemu-iotests/254.out | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-)tests/qemu-iotests/254 +3
-2@@ -29,7 +29,8 @@ 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.qmp_log('block-dirty-bitmap-add', node='drive0', name='bitmap0', + granularity=65536) vm.hmp_qemu_io('drive0', 'write 0 512K')@@ -38,7 +39,7 @@ vm.qmp_log('transaction', indent=2, actions=[ 'data': {'device': 'drive0', 'snapshot-file': top, 'snapshot-node-name': 'snap'}}, {'type': 'block-dirty-bitmap-add', - 'data': {'node': 'snap', 'name': 'bitmap0'}}, + 'data': {'node': 'snap', 'name': 'bitmap0', 'granularity': 65536}}, {'type': 'block-dirty-bitmap-merge', 'data': {'node': 'snap', 'target': 'bitmap0', 'bitmaps': [{'node': 'base', 'name': 'bitmap0'}]}}tests/qemu-iotests/254.out +2
-1@@ -1,4 +1,4 @@ -{"execute": "block-dirty-bitmap-add", "arguments": {"name": "bitmap0", "node": "drive0"}} +{"execute": "block-dirty-bitmap-add", "arguments": {"granularity": 65536, "name": "bitmap0", "node": "drive0"}} {"return": {}} { "execute": "transaction",@@ -14,6 +14,7 @@ }, { "data": { + "granularity": 65536, "name": "bitmap0", "node": "snap" },
Signature · 2 lines
Best regards, Vladimir