[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 02/11] iotests: add transactional incremental bac
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH v2 02/11] iotests: add transactional incremental backup test |
Date: |
Fri, 27 Mar 2015 15:19:56 -0400 |
Test simple usage cases for using transactions to create
and synchronize incremental backups.
Signed-off-by: John Snow <address@hidden>
---
tests/qemu-iotests/124 | 51 ++++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/124.out | 4 ++--
2 files changed, 53 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
index d16d2c2..31946f9 100644
--- a/tests/qemu-iotests/124
+++ b/tests/qemu-iotests/124
@@ -226,6 +226,57 @@ 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 current drive0 image.
+ '''
+
+ drive0 = self.drives[0]
+ bitmap0 = self.add_bitmap('bitmap0', self.drives[0])
+ self.hmp_io_writes(drive0['id'], (('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': bitmap0.drive['id'],
+ 'name': bitmap0.name },
+ },
+ {
+ 'type': 'block-dirty-bitmap-clear',
+ 'data': { 'node': bitmap1.drive['id'],
+ 'name': bitmap1.name },
+ },
+ {
+ 'type': 'drive-backup',
+ 'data': { 'device': drive0['id'],
+ 'sync': 'full',
+ 'format': drive0['fmt'],
+ 'target': drive0['backup'] },
+ }
+ ])
+ self.assert_qmp(result, 'return', {})
+ self.wait_until_completed()
+ self.files.append(drive0['backup'])
+ self.check_full_backup()
+
+ self.hmp_io_writes(drive0['id'], (('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_incremental_failure(self):
'''Test: Verify backups made after a failure are correct.
diff --git a/tests/qemu-iotests/124.out b/tests/qemu-iotests/124.out
index 89968f3..914e373 100644
--- a/tests/qemu-iotests/124.out
+++ b/tests/qemu-iotests/124.out
@@ -1,5 +1,5 @@
-....
+.....
----------------------------------------------------------------------
-Ran 4 tests
+Ran 5 tests
OK
--
2.1.0
- [Qemu-block] [PATCH v2 00/11] block: incremental backup transactions, John Snow, 2015/03/27
- [Qemu-block] [PATCH v2 02/11] iotests: add transactional incremental backup test,
John Snow <=
- [Qemu-block] [PATCH v2 07/11] block: add delayed bitmap successor cleanup, John Snow, 2015/03/27
- [Qemu-block] [PATCH v2 09/11] qmp: Add an implementation wrapper for qmp_drive_backup, John Snow, 2015/03/27
- [Qemu-block] [PATCH v2 11/11] iotests: 124 - transactional failure test, John Snow, 2015/03/27
- [Qemu-block] [PATCH v2 05/11] block: add transactional callbacks feature, John Snow, 2015/03/27
- [Qemu-block] [PATCH v2 10/11] block: drive_backup transaction callback support, John Snow, 2015/03/27
- [Qemu-block] [PATCH v2 03/11] block: rename BlkTransactionState and BdrvActionOps, John Snow, 2015/03/27
- [Qemu-block] [PATCH v2 04/11] block: re-add BlkTransactionState, John Snow, 2015/03/27
- [Qemu-block] [PATCH v2 06/11] block: add refcount to Job object, John Snow, 2015/03/27
- [Qemu-block] [PATCH v2 01/11] qapi: Add transaction support to block-dirty-bitmap operations, John Snow, 2015/03/27
- [Qemu-block] [PATCH v2 08/11] block: move transactions beneath qmp interfaces, John Snow, 2015/03/27