[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/44] iotests: add transactional incremental backup
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 11/44] iotests: add transactional incremental backup test |
Date: |
Tue, 10 Nov 2015 14:14:06 +0000 |
From: John Snow <address@hidden>
Test simple usage cases for using transactions to create
and synchronize incremental backups.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/qemu-iotests/124 | 54 ++++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/124.out | 4 ++--
2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124
index 9ccd118..9c1977e 100644
--- a/tests/qemu-iotests/124
+++ b/tests/qemu-iotests/124
@@ -36,6 +36,23 @@ def try_remove(img):
pass
+def transaction_action(action, **kwargs):
+ return {
+ 'type': action,
+ 'data': kwargs
+ }
+
+
+def transaction_bitmap_clear(node, name, **kwargs):
+ return transaction_action('block-dirty-bitmap-clear',
+ node=node, name=name, **kwargs)
+
+
+def transaction_drive_backup(device, target, **kwargs):
+ return transaction_action('drive-backup', device=device, target=target,
+ **kwargs)
+
+
class Bitmap:
def __init__(self, name, drive):
self.name = name
@@ -264,6 +281,43 @@ class TestIncrementalBackup(iotests.QMPTestCase):
return self.do_incremental_simple(granularity=131072)
+ 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', drive0)
+ 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=[
+ transaction_bitmap_clear(bitmap0.drive['id'], bitmap0.name),
+ transaction_bitmap_clear(bitmap1.drive['id'], bitmap1.name),
+ transaction_drive_backup(drive0['id'], drive0['backup'],
+ sync='full', format=drive0['fmt'])
+ ])
+ self.assert_qmp(result, 'return', {})
+ self.wait_until_completed(drive0['id'])
+ self.files.append(drive0['backup'])
+
+ self.hmp_io_writes(drive0['id'], (('0x9a', 0, 512),
+ ('0x55', '8M', '352k'),
+ ('0x78', '15872k', '1M')))
+ # Both bitmaps should be correctly in sync.
+ self.create_incremental(bitmap0)
+ self.create_incremental(bitmap1)
+ self.vm.shutdown()
+ self.check_backups()
+
+
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 2f7d390..594c16f 100644
--- a/tests/qemu-iotests/124.out
+++ b/tests/qemu-iotests/124.out
@@ -1,5 +1,5 @@
-.......
+........
----------------------------------------------------------------------
-Ran 7 tests
+Ran 8 tests
OK
--
2.5.0
- [Qemu-devel] [PULL 01/44] block: Add more types for tracked request, (continued)
- [Qemu-devel] [PULL 01/44] block: Add more types for tracked request, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 04/44] iscsi: Emulate commands in iscsi_aio_ioctl as iscsi_ioctl, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 02/44] block: Track flush requests, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 03/44] block: Track discard requests, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 05/44] block: Add ioctl parameter fields to BlockRequest, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 06/44] block: Emulate bdrv_ioctl with bdrv_aio_ioctl and track both, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 09/44] qed: Implement .bdrv_drain, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 07/44] block: Drop BlockDriver.bdrv_ioctl, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 08/44] block: Introduce BlockDriver.bdrv_drain callback, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 10/44] qapi: Add transaction support to block-dirty-bitmap operations, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 11/44] iotests: add transactional incremental backup test,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 13/44] backup: Extract dirty bitmap handling as a separate function, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 12/44] block: rename BlkTransactionState and BdrvActionOps, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 14/44] blockjob: Introduce reference count and fix reference to job->bs, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 16/44] blockjob: Add "completed" and "ret" in BlockJob, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 18/44] block: Add block job transactions, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 17/44] blockjob: Simplify block_job_finish_sync, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 15/44] blockjob: Add .commit and .abort block job actions, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 19/44] block/backup: Rely on commit/abort for cleanup, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 20/44] block: Add BlockJobTxn support to backup_run, Stefan Hajnoczi, 2015/11/10
- [Qemu-devel] [PULL 22/44] iotests: 124 - transactional failure test, Stefan Hajnoczi, 2015/11/10