Commit e1b5c51f authored by Pavel Butsykin's avatar Pavel Butsykin Committed by Kevin Wolf
Browse files

qemu-iotests: test backup compression in 055



Added cases to check the backup compression out of qcow2, raw in qcow2
on drive-backup and blockdev-backup.

Signed-off-by: default avatarPavel Butsykin <pbutsykin@virtuozzo.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
CC: Jeff Cody <jcody@redhat.com>
CC: Markus Armbruster <armbru@redhat.com>
CC: Eric Blake <eblake@redhat.com>
CC: John Snow <jsnow@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
CC: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 3b7b1236
Loading
Loading
Loading
Loading
+97 −0
Original line number Diff line number Diff line
@@ -448,5 +448,102 @@ class TestSingleTransaction(iotests.QMPTestCase):
        self.assert_qmp(result, 'error/class', 'GenericError')
        self.assert_no_active_block_jobs()


class TestDriveCompression(iotests.QMPTestCase):
    image_len = 64 * 1024 * 1024 # MB
    outfmt = 'qcow2'

    def setUp(self):
        # Write data to the image so we can compare later
        qemu_img('create', '-f', iotests.imgfmt, test_img, str(TestDriveCompression.image_len))
        qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x11 0 64k', test_img)
        qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x00 64k 128k', test_img)
        qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x22 162k 32k', test_img)
        qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x33 67043328 64k', test_img)

        qemu_img('create', '-f', TestDriveCompression.outfmt, blockdev_target_img,
                 str(TestDriveCompression.image_len))
        self.vm = iotests.VM().add_drive(test_img).add_drive(blockdev_target_img,
                                                             format=TestDriveCompression.outfmt)
        self.vm.launch()

    def tearDown(self):
        self.vm.shutdown()
        os.remove(test_img)
        os.remove(blockdev_target_img)
        try:
            os.remove(target_img)
        except OSError:
            pass

    def do_test_compress_complete(self, cmd, **args):
        self.assert_no_active_block_jobs()

        result = self.vm.qmp(cmd, device='drive0', sync='full', compress=True, **args)
        self.assert_qmp(result, 'return', {})

        self.wait_until_completed()

        self.vm.shutdown()
        self.assertTrue(iotests.compare_images(test_img, blockdev_target_img,
                                               iotests.imgfmt, TestDriveCompression.outfmt),
                        'target image does not match source after backup')

    def test_complete_compress_drive_backup(self):
        self.do_test_compress_complete('drive-backup', target=blockdev_target_img, mode='existing')

    def test_complete_compress_blockdev_backup(self):
        self.do_test_compress_complete('blockdev-backup', target='drive1')

    def do_test_compress_cancel(self, cmd, **args):
        self.assert_no_active_block_jobs()

        result = self.vm.qmp(cmd, device='drive0', sync='full', compress=True, **args)
        self.assert_qmp(result, 'return', {})

        event = self.cancel_and_wait()
        self.assert_qmp(event, 'data/type', 'backup')

    def test_compress_cancel_drive_backup(self):
        self.do_test_compress_cancel('drive-backup', target=blockdev_target_img, mode='existing')

    def test_compress_cancel_blockdev_backup(self):
        self.do_test_compress_cancel('blockdev-backup', target='drive1')

    def do_test_compress_pause(self, cmd, **args):
        self.assert_no_active_block_jobs()

        self.vm.pause_drive('drive0')
        result = self.vm.qmp(cmd, device='drive0', sync='full', compress=True, **args)
        self.assert_qmp(result, 'return', {})

        result = self.vm.qmp('block-job-pause', device='drive0')
        self.assert_qmp(result, 'return', {})

        self.vm.resume_drive('drive0')
        time.sleep(1)
        result = self.vm.qmp('query-block-jobs')
        offset = self.dictpath(result, 'return[0]/offset')

        time.sleep(1)
        result = self.vm.qmp('query-block-jobs')
        self.assert_qmp(result, 'return[0]/offset', offset)

        result = self.vm.qmp('block-job-resume', device='drive0')
        self.assert_qmp(result, 'return', {})

        self.wait_until_completed()

        self.vm.shutdown()
        self.assertTrue(iotests.compare_images(test_img, blockdev_target_img,
                                               iotests.imgfmt, TestDriveCompression.outfmt),
                        'target image does not match source after backup')

    def test_compress_pause_drive_backup(self):
        self.do_test_compress_pause('drive-backup', target=blockdev_target_img, mode='existing')

    def test_compress_pause_blockdev_backup(self):
        self.do_test_compress_pause('blockdev-backup', target='drive1')

if __name__ == '__main__':
    iotests.main(supported_fmts=['raw', 'qcow2'])
+2 −2
Original line number Diff line number Diff line
........................
..............................
----------------------------------------------------------------------
Ran 24 tests
Ran 30 tests

OK
+5 −5
Original line number Diff line number Diff line
@@ -86,10 +86,10 @@ def qemu_io(*args):
        sys.stderr.write('qemu-io received signal %i: %s\n' % (-exitcode, ' '.join(args)))
    return subp.communicate()[0]

def compare_images(img1, img2):
def compare_images(img1, img2, fmt1=imgfmt, fmt2=imgfmt):
    '''Return True if two image files are identical'''
    return qemu_img('compare', '-f', imgfmt,
                    '-F', imgfmt, img1, img2) == 0
    return qemu_img('compare', '-f', fmt1,
                    '-F', fmt2, img1, img2) == 0

def create_image(name, size):
    '''Create a fully-allocated raw image with sector markers'''
@@ -141,14 +141,14 @@ class VM(qtest.QEMUQtestMachine):
        self._args.append(opts)
        return self

    def add_drive(self, path, opts='', interface='virtio'):
    def add_drive(self, path, opts='', interface='virtio', format=imgfmt):
        '''Add a virtio-blk drive to the VM'''
        options = ['if=%s' % interface,
                   'id=drive%d' % self._num_drives]

        if path is not None:
            options.append('file=%s' % path)
            options.append('format=%s' % imgfmt)
            options.append('format=%s' % format)
            options.append('cache=%s' % cachemode)

        if opts: