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