From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57482) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMOQK-00043Z-6L for qemu-devel@nongnu.org; Fri, 13 Feb 2015 17:09:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YMOQJ-0004Gy-3P for qemu-devel@nongnu.org; Fri, 13 Feb 2015 17:09:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YMOQI-0004GN-S1 for qemu-devel@nongnu.org; Fri, 13 Feb 2015 17:09:19 -0500 From: John Snow Date: Fri, 13 Feb 2015 17:08:57 -0500 Message-Id: <1423865338-8576-17-git-send-email-jsnow@redhat.com> In-Reply-To: <1423865338-8576-1-git-send-email-jsnow@redhat.com> References: <1423865338-8576-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v13 16/17] iotests: add transactional incremental backup test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, John Snow , armbru@redhat.com, mreitz@redhat.com, vsementsov@parallels.com, stefanha@redhat.com Reviewed-by: Max Reitz Signed-off-by: John Snow --- tests/qemu-iotests/112 | 49 ++++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/112.out | 4 ++-- 2 files changed, 51 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112 index da8f0e0..59eb1b1 100644 --- a/tests/qemu-iotests/112 +++ b/tests/qemu-iotests/112 @@ -180,6 +180,55 @@ class TestIncrementalBackup(iotests.QMPTestCase): return True + def test_incremental_transaction(self): + '''Test: Verify backups made from transactionally created bitmaps. + + Create a bitmap "before" VM execution begins, then create a second + bitmap AFTER writes have already occurred. Use transactions to create + a full backup and synchronize both bitmaps to this backup. + Create an incremental backup through both bitmaps and verify that + both backups match the full backup. + ''' + bitmap0 = self.add_bitmap('bitmap0', 'drive0') + self.hmp_io_writes('drive0', (('0xab', 0, 512), + ('0xfe', '16M', '256k'), + ('0x64', '32736k', '64k'))) + bitmap1 = self.add_bitmap('bitmap1', 'drive0') + + result = self.vm.qmp('transaction', actions=[ + { + 'type': 'block-dirty-bitmap-clear', + 'data': { 'node': 'drive0', + 'name': 'bitmap0' }, + }, + { + 'type': 'block-dirty-bitmap-clear', + 'data': { 'node': 'drive0', + 'name': 'bitmap1' }, + }, + { + 'type': 'drive-backup', + 'data': { 'device': 'drive0', + 'sync': 'full', + 'format': iotests.imgfmt, + 'target': self.full_bak }, + } + ]) + self.assert_qmp(result, 'return', {}) + self.wait_until_completed() + self.files.append(self.full_bak) + self.check_full_backup() + + self.hmp_io_writes('drive0', (('0x9a', 0, 512), + ('0x55', '8M', '352k'), + ('0x78', '15872k', '1M'))) + # Both bitmaps should be in sync and create fully valid + # incremental backups + res1 = self.create_incremental(bitmap0) + res2 = self.create_incremental(bitmap1) + self.assertTrue(res1 and res2) + + def test_sync_dirty_bitmap_missing(self): self.assert_no_active_block_jobs() self.files.append(self.foo_img) diff --git a/tests/qemu-iotests/112.out b/tests/qemu-iotests/112.out index 8d7e996..89968f3 100644 --- a/tests/qemu-iotests/112.out +++ b/tests/qemu-iotests/112.out @@ -1,5 +1,5 @@ -... +.... ---------------------------------------------------------------------- -Ran 3 tests +Ran 4 tests OK -- 1.9.3