From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com,
qemu-devel@nongnu.org, mreitz@redhat.com
Subject: [PATCH 3/3] iotests: Backup with different source/target size
Date: Wed, 29 Apr 2020 13:15:39 +0200 [thread overview]
Message-ID: <20200429111539.42103-4-kwolf@redhat.com> (raw)
In-Reply-To: <20200429111539.42103-1-kwolf@redhat.com>
This tests that the backup jobs catches situations where the target node
has a different size than the source node. It must also forbid resize
operations when the job is already running.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/055 | 60 ++++++++++++++++++++++++++++++++++++--
tests/qemu-iotests/055.out | 4 +--
2 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055
index 82b9f5f47d..243d66a62e 100755
--- a/tests/qemu-iotests/055
+++ b/tests/qemu-iotests/055
@@ -48,8 +48,10 @@ class TestSingleDrive(iotests.QMPTestCase):
def setUp(self):
qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img, str(image_len))
- self.vm = iotests.VM().add_drive('blkdebug::' + test_img)
- self.vm.add_drive(blockdev_target_img, interface="none")
+ self.vm = iotests.VM()
+ self.vm.add_drive('blkdebug::' + test_img, 'node-name=source')
+ self.vm.add_drive(blockdev_target_img, 'node-name=target',
+ interface="none")
if iotests.qemu_default_machine == 'pc':
self.vm.add_drive(None, 'media=cdrom', 'ide')
self.vm.launch()
@@ -112,6 +114,60 @@ class TestSingleDrive(iotests.QMPTestCase):
def test_pause_blockdev_backup(self):
self.do_test_pause('blockdev-backup', 'drive1', blockdev_target_img)
+ def test_source_resize_blockdev_backup(self):
+ self.assert_no_active_block_jobs()
+
+ def pre_finalize():
+ result = self.vm.qmp('block_resize', device='drive0', size=65536)
+ self.assert_qmp(result, 'error/class', 'GenericError')
+
+ result = self.vm.qmp('block_resize', node_name='source', size=65536)
+ self.assert_qmp(result, 'error/class', 'GenericError')
+
+ result = self.vm.qmp('blockdev-backup', job_id='job0', device='drive0',
+ target='drive1', sync='full', auto_finalize=False,
+ auto_dismiss=False)
+ self.assert_qmp(result, 'return', {})
+
+ self.vm.run_job('job0', auto_finalize=False, pre_finalize=pre_finalize,
+ use_log=False)
+
+ def test_target_resize_blockdev_backup(self):
+ self.assert_no_active_block_jobs()
+
+ def pre_finalize():
+ result = self.vm.qmp('block_resize', device='drive1', size=65536)
+ self.assert_qmp(result, 'error/class', 'GenericError')
+
+ result = self.vm.qmp('block_resize', node_name='target', size=65536)
+ self.assert_qmp(result, 'error/class', 'GenericError')
+
+ result = self.vm.qmp('blockdev-backup', job_id='job0', device='drive0',
+ target='drive1', sync='full', auto_finalize=False,
+ auto_dismiss=False)
+ self.assert_qmp(result, 'return', {})
+
+ self.vm.run_job('job0', auto_finalize=False, pre_finalize=pre_finalize,
+ use_log=False)
+
+ def test_small_target(self):
+ short_len = image_len // 2
+ result = self.vm.qmp('block_resize', device='drive1', size=short_len)
+ self.assert_qmp(result, 'return', {})
+
+ result = self.vm.qmp('blockdev-backup', job_id='job0', device='drive0',
+ target='drive1', sync='full')
+ self.assert_qmp(result, 'error/class', 'GenericError')
+
+ def test_large_target(self):
+ short_len = image_len * 2
+ result = self.vm.qmp('block_resize', device='drive1', size=short_len)
+ self.assert_qmp(result, 'return', {})
+
+ result = self.vm.qmp('blockdev-backup', job_id='job0', device='drive0',
+ target='drive1', sync='full')
+ self.assert_qmp(result, 'error/class', 'GenericError')
+
def test_medium_not_found(self):
if iotests.qemu_default_machine != 'pc':
return
diff --git a/tests/qemu-iotests/055.out b/tests/qemu-iotests/055.out
index 5ce2f9a2ed..88bf7fa73a 100644
--- a/tests/qemu-iotests/055.out
+++ b/tests/qemu-iotests/055.out
@@ -1,5 +1,5 @@
-..............................
+..................................
----------------------------------------------------------------------
-Ran 30 tests
+Ran 34 tests
OK
--
2.25.3
next prev parent reply other threads:[~2020-04-29 11:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 11:15 [PATCH 0/3] backup: Make sure that source and target size match Kevin Wolf
2020-04-29 11:15 ` [PATCH 1/3] backup: Improve error for bdrv_getlength() failure Kevin Wolf
2020-04-29 11:29 ` Vladimir Sementsov-Ogievskiy
2020-04-29 12:31 ` Alberto Garcia
2020-04-29 11:15 ` [PATCH 2/3] backup: Make sure that source and target size match Kevin Wolf
2020-04-29 12:00 ` Vladimir Sementsov-Ogievskiy
2020-04-29 11:15 ` Kevin Wolf [this message]
2020-04-29 12:28 ` [PATCH 3/3] iotests: Backup with different source/target size Vladimir Sementsov-Ogievskiy
2020-04-30 11:41 ` Kevin Wolf
2020-04-30 12:16 ` Vladimir Sementsov-Ogievskiy
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=20200429111539.42103-4-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=jsnow@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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).