Re: [Qemu-devel] [PATCH v2 02/10] iotests: add transactional incremental backup test

[Fam Zheng]

On Mon, 07/06 15:24, Stefan Hajnoczi wrote:
> 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>
> ---
>  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.4.3
> 

Reviewed-by: Fam Zheng <address@hidden>