cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From e56ee6a66cc5452a46426b11d642da792b7ee75d Mon Sep 17 00:00:00 2001
26ba25
From: John Snow <jsnow@redhat.com>
26ba25
Date: Tue, 20 Nov 2018 18:18:28 +0000
26ba25
Subject: [PATCH 34/35] iotests: 169: add cases for source vm resuming
26ba25
26ba25
RH-Author: John Snow <jsnow@redhat.com>
26ba25
Message-id: <20181120181828.15132-25-jsnow@redhat.com>
26ba25
Patchwork-id: 83068
26ba25
O-Subject: [RHEL8/rhel qemu-kvm PATCH 24/24] iotests: 169: add cases for source vm resuming
26ba25
Bugzilla: 1518989
26ba25
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
26ba25
RH-Acked-by: Max Reitz <mreitz@redhat.com>
26ba25
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
26ba25
26ba25
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
26ba25
26ba25
Test that we can resume source vm after [failed] migration, and bitmaps
26ba25
are ok.
26ba25
26ba25
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
26ba25
Signed-off-by: John Snow <jsnow@redhat.com>
26ba25
(cherry picked from commit 3e6d88f280a53b5b399e73b1f80efe4c3db306f1)
26ba25
Signed-off-by: John Snow <jsnow@redhat.com>
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 tests/qemu-iotests/169     | 60 +++++++++++++++++++++++++++++++++++++++++++++-
26ba25
 tests/qemu-iotests/169.out |  4 ++--
26ba25
 2 files changed, 61 insertions(+), 3 deletions(-)
26ba25
26ba25
diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/169
26ba25
index 8b7947d..69850c4 100755
26ba25
--- a/tests/qemu-iotests/169
26ba25
+++ b/tests/qemu-iotests/169
26ba25
@@ -77,6 +77,58 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase):
26ba25
             self.assert_qmp(result, 'error/desc',
26ba25
                             "Dirty bitmap 'bitmap0' not found");
26ba25
 
26ba25
+    def do_test_migration_resume_source(self, persistent, migrate_bitmaps):
26ba25
+        granularity = 512
26ba25
+
26ba25
+        # regions = ((start, count), ...)
26ba25
+        regions = ((0, 0x10000),
26ba25
+                   (0xf0000, 0x10000),
26ba25
+                   (0xa0201, 0x1000))
26ba25
+
26ba25
+        mig_caps = [{'capability': 'events', 'state': True}]
26ba25
+        if migrate_bitmaps:
26ba25
+            mig_caps.append({'capability': 'dirty-bitmaps', 'state': True})
26ba25
+
26ba25
+        result = self.vm_a.qmp('migrate-set-capabilities',
26ba25
+                               capabilities=mig_caps)
26ba25
+        self.assert_qmp(result, 'return', {})
26ba25
+
26ba25
+        self.add_bitmap(self.vm_a, granularity, persistent)
26ba25
+        for r in regions:
26ba25
+            self.vm_a.hmp_qemu_io('drive0', 'write %d %d' % r)
26ba25
+        sha256 = self.get_bitmap_hash(self.vm_a)
26ba25
+
26ba25
+        result = self.vm_a.qmp('migrate', uri=mig_cmd)
26ba25
+        while True:
26ba25
+            event = self.vm_a.event_wait('MIGRATION')
26ba25
+            if event['data']['status'] == 'completed':
26ba25
+                break
26ba25
+
26ba25
+        # test that bitmap is still here
26ba25
+        removed = (not migrate_bitmaps) and persistent
26ba25
+        self.check_bitmap(self.vm_a, False if removed else sha256)
26ba25
+
26ba25
+        self.vm_a.qmp('cont')
26ba25
+
26ba25
+        # test that bitmap is still here after invalidation
26ba25
+        self.check_bitmap(self.vm_a, sha256)
26ba25
+
26ba25
+        # shutdown and check that invalidation didn't fail
26ba25
+        self.vm_a.shutdown()
26ba25
+
26ba25
+        # catch 'Could not reopen qcow2 layer: Bitmap already exists'
26ba25
+        # possible error
26ba25
+        log = self.vm_a.get_log()
26ba25
+        log = re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', log)
26ba25
+        log = re.sub(r'^(wrote .* bytes at offset .*\n.*KiB.*ops.*sec.*\n){3}',
26ba25
+                     '', log)
26ba25
+        log = re.sub(r'\[I \+\d+\.\d+\] CLOSED\n?$', '', log)
26ba25
+        self.assertEqual(log, '')
26ba25
+
26ba25
+        # test that bitmap is still persistent
26ba25
+        self.vm_a.launch()
26ba25
+        self.check_bitmap(self.vm_a, sha256 if persistent else False)
26ba25
+
26ba25
     def do_test_migration(self, persistent, migrate_bitmaps, online,
26ba25
                           shared_storage):
26ba25
         granularity = 512
26ba25
@@ -152,7 +204,7 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase):
26ba25
 
26ba25
 def inject_test_case(klass, name, method, *args, **kwargs):
26ba25
     mc = operator.methodcaller(method, *args, **kwargs)
26ba25
-    setattr(klass, 'test_' + name, new.instancemethod(mc, None, klass))
26ba25
+    setattr(klass, 'test_' + method + name, new.instancemethod(mc, None, klass))
26ba25
 
26ba25
 for cmb in list(itertools.product((True, False), repeat=4)):
26ba25
     name = ('_' if cmb[0] else '_not_') + 'persistent_'
26ba25
@@ -163,6 +215,12 @@ for cmb in list(itertools.product((True, False), repeat=4)):
26ba25
     inject_test_case(TestDirtyBitmapMigration, name, 'do_test_migration',
26ba25
                      *list(cmb))
26ba25
 
26ba25
+for cmb in list(itertools.product((True, False), repeat=2)):
26ba25
+    name = ('_' if cmb[0] else '_not_') + 'persistent_'
26ba25
+    name += ('_' if cmb[1] else '_not_') + 'migbitmap'
26ba25
+
26ba25
+    inject_test_case(TestDirtyBitmapMigration, name,
26ba25
+                     'do_test_migration_resume_source', *list(cmb))
26ba25
 
26ba25
 if __name__ == '__main__':
26ba25
     iotests.main(supported_fmts=['qcow2'])
26ba25
diff --git a/tests/qemu-iotests/169.out b/tests/qemu-iotests/169.out
26ba25
index b6f2576..3a89159 100644
26ba25
--- a/tests/qemu-iotests/169.out
26ba25
+++ b/tests/qemu-iotests/169.out
26ba25
@@ -1,5 +1,5 @@
26ba25
-................
26ba25
+....................
26ba25
 ----------------------------------------------------------------------
26ba25
-Ran 16 tests
26ba25
+Ran 20 tests
26ba25
 
26ba25
 OK
26ba25
-- 
26ba25
1.8.3.1
26ba25