iotest: Further enhance qemu-img-bitmaps
PATCH 1/1 iotest: Further enhance qemu-img-bitmaps
Add a regression test to make sure we detect attempts to use 'qemu-img bitmap' to modify an in-use local file.
---
Sadly, this missed my bitmaps pull request today. If there's any reason to respin that pull request, I'm inclined to add this in, as it just touches the iotests; otherwise, if it slips to 6.2 it's not too bad.
tests/qemu-iotests/tests/qemu-img-bitmaps | 6 ++++++ tests/qemu-iotests/tests/qemu-img-bitmaps.out | 5 +++++ 2 files changed, 11 insertions(+)
tests/qemu-iotests/tests/qemu-img-bitmaps +6 -0
@@ -129,6 +129,12 @@ $QEMU_IMG map --output=json --image-opts \ $QEMU_IMG map --output=json --image-opts \ "$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b3" | _filter_qemu_img_map +echo +echo "=== bitmap command fails to modify image already in use ===" +echo + +$QEMU_IMG bitmap --add "$TEST_IMG" b4 2>&1 | _filter_testdir + nbd_server_stop echo
tests/qemu-iotests/tests/qemu-img-bitmaps.out +5 -0
@@ -116,6 +116,11 @@ Format specific information: { "start": 2097152, "length": 1048576, "depth": 0, "present": false, "zero": false, "data": false}, { "start": 3145728, "length": 7340032, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET}] +=== bitmap command fails to modify image already in use === + +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock +Is another process using the image [TEST_DIR/t.qcow2]? + === Check handling of inconsistent bitmap === image: TEST_DIR/t.IMGFMT
Signature · 1 line
2.31.1
Quoted 40 lines · Eric Blake
Add a regression test to make sure we detect attempts to use 'qemu-img bitmap' to modify an in-use local file.
Suggested-by Nir Soffer <[email protected]>Signed-off-by Eric Blake <[email protected]>---
Sadly, this missed my bitmaps pull request today. If there's any reason to respin that pull request, I'm inclined to add this in, as it just touches the iotests; otherwise, if it slips to 6.2 it's not too bad.
tests/qemu-iotests/tests/qemu-img-bitmaps | 6 ++++++ tests/qemu-iotests/tests/qemu-img-bitmaps.out | 5 +++++ 2 files changed, 11 insertions(+)tests/qemu-iotests/tests/qemu-img-bitmaps +6
-0@@ -129,6 +129,12 @@ $QEMU_IMG map --output=json --image-opts \ $QEMU_IMG map --output=json --image-opts \ "$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b3" | _filter_qemu_img_map +echo +echo "=== bitmap command fails to modify image already in use ===" +echo + +$QEMU_IMG bitmap --add "$TEST_IMG" b4 2>&1 | _filter_testdir + nbd_server_stop echotests/qemu-iotests/tests/qemu-img-bitmaps.out +0
-0@@ -116,6 +116,11 @@ Format specific information: { "start": 2097152, "length": 1048576, "depth": 0, "present": false, "zero": false, "data": false},
tests/qemu-iotests/tests/qemu-img-bitmaps.out Format specific information: · line 126
Quoted 10 lines
tests/qemu-iotests/tests/qemu-img-bitmaps.out +5
-0{ "start": 3145728, "length": 7340032, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET}] +=== bitmap command fails to modify image already in use === + +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock +Is another process using the image [TEST_DIR/t.qcow2]? + === Check handling of inconsistent bitmap === image: TEST_DIR/t.IMGFMT
It would be nice to test more than --add. I guess the implementation is shared but if someone change it the test will protect us.
Quoted 40 lines · Eric Blake
Add a regression test to make sure we detect attempts to use 'qemu-img bitmap' to modify an in-use local file.
Suggested-by Nir Soffer <[email protected]>Signed-off-by Eric Blake <[email protected]>---
Sadly, this missed my bitmaps pull request today. If there's any reason to respin that pull request, I'm inclined to add this in, as it just touches the iotests; otherwise, if it slips to 6.2 it's not too bad.
tests/qemu-iotests/tests/qemu-img-bitmaps | 6 ++++++ tests/qemu-iotests/tests/qemu-img-bitmaps.out | 5 +++++ 2 files changed, 11 insertions(+)tests/qemu-iotests/tests/qemu-img-bitmaps +6
-0@@ -129,6 +129,12 @@ $QEMU_IMG map --output=json --image-opts \ $QEMU_IMG map --output=json --image-opts \ "$IMG,x-dirty-bitmap=qemu:dirty-bitmap:b3" | _filter_qemu_img_map +echo +echo "=== bitmap command fails to modify image already in use ===" +echo + +$QEMU_IMG bitmap --add "$TEST_IMG" b4 2>&1 | _filter_testdir + nbd_server_stop echotests/qemu-iotests/tests/qemu-img-bitmaps.out +0
-0@@ -116,6 +116,11 @@ Format specific information: { "start": 2097152, "length": 1048576, "depth": 0, "present": false, "zero": false, "data": false},
tests/qemu-iotests/tests/qemu-img-bitmaps.out Format specific information: · line 126
Quoted 10 lines
tests/qemu-iotests/tests/qemu-img-bitmaps.out +5
-0{ "start": 3145728, "length": 7340032, "depth": 0, "present": true, "zero": false, "data": true, "offset": OFFSET}] +=== bitmap command fails to modify image already in use === + +qemu-img: Could not open 'TEST_DIR/t.qcow2': Failed to get "write" lock +Is another process using the image [TEST_DIR/t.qcow2]? + === Check handling of inconsistent bitmap === image: TEST_DIR/t.IMGFMT
I'm not against, but why you decided to add such a test? Lock should work for any operation, what's the reason to check bitmaps separately? Or it was broken recently?
anyway:
Signature · 2 lines
Best regards, Vladimir
Quoted 11 lines · Eric Blake
Add a regression test to make sure we detect attempts to use 'qemu-img bitmap' to modify an in-use local file.
Suggested-by Nir Soffer <[email protected]>Signed-off-by Eric Blake <[email protected]>---
Sadly, this missed my bitmaps pull request today. If there's any reason to respin that pull request, I'm inclined to add this in, as it just touches the iotests; otherwise, if it slips to 6.2 it's not too bad.
(Going through my patches folder...)
Not sure if you’re still interested in this, but if so, we should skip this test case if OFD locks are not available (like 153 does).
Hanna