mirror of https://gitee.com/openkylin/qemu.git
iotests: fix 169
Improve and fix 169: - use MIGRATION events instead of RESUME - make a TODO: enable dirty-bitmaps capability for offline case - recreate vm_b without -incoming near test end This (likely) fixes racy faults at least of the following types: - timeout on waiting for RESUME event - sha256 mismatch on line 136 (142 after this patch) - fail to self.vm_b.launch() on line 135 (141 now after this patch) And surely fixes cat processes, left after test finish. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Message-id: 20180411122606.367301-3-vsementsov@virtuozzo.com Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
605bc8be42
commit
25bf2426f3
tests/qemu-iotests
|
@ -31,6 +31,8 @@ disk_a = os.path.join(iotests.test_dir, 'disk_a')
|
||||||
disk_b = os.path.join(iotests.test_dir, 'disk_b')
|
disk_b = os.path.join(iotests.test_dir, 'disk_b')
|
||||||
size = '1M'
|
size = '1M'
|
||||||
mig_file = os.path.join(iotests.test_dir, 'mig_file')
|
mig_file = os.path.join(iotests.test_dir, 'mig_file')
|
||||||
|
mig_cmd = 'exec: cat > ' + mig_file
|
||||||
|
incoming_cmd = 'exec: cat ' + mig_file
|
||||||
|
|
||||||
|
|
||||||
class TestDirtyBitmapMigration(iotests.QMPTestCase):
|
class TestDirtyBitmapMigration(iotests.QMPTestCase):
|
||||||
|
@ -49,7 +51,6 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase):
|
||||||
self.vm_a.launch()
|
self.vm_a.launch()
|
||||||
|
|
||||||
self.vm_b = iotests.VM(path_suffix='b')
|
self.vm_b = iotests.VM(path_suffix='b')
|
||||||
self.vm_b.add_incoming("exec: cat '" + mig_file + "'")
|
|
||||||
|
|
||||||
def add_bitmap(self, vm, granularity, persistent):
|
def add_bitmap(self, vm, granularity, persistent):
|
||||||
params = {'node': 'drive0',
|
params = {'node': 'drive0',
|
||||||
|
@ -86,36 +87,30 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase):
|
||||||
(0xa0201, 0x1000))
|
(0xa0201, 0x1000))
|
||||||
|
|
||||||
should_migrate = migrate_bitmaps or persistent and shared_storage
|
should_migrate = migrate_bitmaps or persistent and shared_storage
|
||||||
|
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.vm_b.add_incoming(incoming_cmd if online else "defer")
|
||||||
self.vm_b.add_drive(disk_a if shared_storage else disk_b)
|
self.vm_b.add_drive(disk_a if shared_storage else disk_b)
|
||||||
|
|
||||||
if online:
|
if online:
|
||||||
os.mkfifo(mig_file)
|
os.mkfifo(mig_file)
|
||||||
self.vm_b.launch()
|
self.vm_b.launch()
|
||||||
|
result = self.vm_b.qmp('migrate-set-capabilities',
|
||||||
|
capabilities=mig_caps)
|
||||||
|
self.assert_qmp(result, 'return', {})
|
||||||
|
|
||||||
self.add_bitmap(self.vm_a, granularity, persistent)
|
self.add_bitmap(self.vm_a, granularity, persistent)
|
||||||
for r in regions:
|
for r in regions:
|
||||||
self.vm_a.hmp_qemu_io('drive0', 'write %d %d' % r)
|
self.vm_a.hmp_qemu_io('drive0', 'write %d %d' % r)
|
||||||
sha256 = self.get_bitmap_hash(self.vm_a)
|
sha256 = self.get_bitmap_hash(self.vm_a)
|
||||||
|
|
||||||
if migrate_bitmaps:
|
result = self.vm_a.qmp('migrate', uri=mig_cmd)
|
||||||
capabilities = [{'capability': 'dirty-bitmaps', 'state': True}]
|
|
||||||
|
|
||||||
result = self.vm_a.qmp('migrate-set-capabilities',
|
|
||||||
capabilities=capabilities)
|
|
||||||
self.assert_qmp(result, 'return', {})
|
|
||||||
|
|
||||||
if online:
|
|
||||||
result = self.vm_b.qmp('migrate-set-capabilities',
|
|
||||||
capabilities=capabilities)
|
|
||||||
self.assert_qmp(result, 'return', {})
|
|
||||||
|
|
||||||
result = self.vm_a.qmp('migrate-set-capabilities',
|
|
||||||
capabilities=[{'capability': 'events',
|
|
||||||
'state': True}])
|
|
||||||
self.assert_qmp(result, 'return', {})
|
|
||||||
|
|
||||||
result = self.vm_a.qmp('migrate', uri='exec:cat>' + mig_file)
|
|
||||||
while True:
|
while True:
|
||||||
event = self.vm_a.event_wait('MIGRATION')
|
event = self.vm_a.event_wait('MIGRATION')
|
||||||
if event['data']['status'] == 'completed':
|
if event['data']['status'] == 'completed':
|
||||||
|
@ -124,14 +119,25 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase):
|
||||||
if not online:
|
if not online:
|
||||||
self.vm_a.shutdown()
|
self.vm_a.shutdown()
|
||||||
self.vm_b.launch()
|
self.vm_b.launch()
|
||||||
# TODO enable bitmap capability for vm_b in this case
|
result = self.vm_b.qmp('migrate-set-capabilities',
|
||||||
|
capabilities=mig_caps)
|
||||||
|
self.assert_qmp(result, 'return', {})
|
||||||
|
result = self.vm_b.qmp('migrate-incoming', uri=incoming_cmd)
|
||||||
|
self.assert_qmp(result, 'return', {})
|
||||||
|
|
||||||
self.vm_b.event_wait("RESUME", timeout=10.0)
|
while True:
|
||||||
|
event = self.vm_b.event_wait('MIGRATION')
|
||||||
|
if event['data']['status'] == 'completed':
|
||||||
|
break
|
||||||
|
|
||||||
self.check_bitmap(self.vm_b, sha256 if should_migrate else False)
|
self.check_bitmap(self.vm_b, sha256 if should_migrate else False)
|
||||||
|
|
||||||
if should_migrate:
|
if should_migrate:
|
||||||
self.vm_b.shutdown()
|
self.vm_b.shutdown()
|
||||||
|
# recreate vm_b, as we don't want -incoming option (this will lead
|
||||||
|
# to "cat" process left alive after test finish)
|
||||||
|
self.vm_b = iotests.VM(path_suffix='b')
|
||||||
|
self.vm_b.add_drive(disk_a if shared_storage else disk_b)
|
||||||
self.vm_b.launch()
|
self.vm_b.launch()
|
||||||
self.check_bitmap(self.vm_b, sha256 if persistent else False)
|
self.check_bitmap(self.vm_b, sha256 if persistent else False)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue