OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qemu-iotests/199: prepare for new test-cases addition

Browse Source 
Move future common part to start_postcopy() method. Move checking
number of bitmaps to check_bitmap().

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Message-Id: <20200727194236.19551-19-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2020-07-27 22:42:33 +03:00 committed by Eric Blake
parent ee64722514
commit 48f43820cd
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/qemu-iotests/199
View File

@ -29,6 +29,8 @@ disk_b = os.path.join(iotests.test_dir, 'disk_b')
size = '256G' size = '256G'
fifo = os.path.join(iotests.test_dir, 'mig_fifo') fifo = os.path.join(iotests.test_dir, 'mig_fifo')
granularity = 512
nb_bitmaps = 15
GiB = 1024 * 1024 * 1024 GiB = 1024 * 1024 * 1024
@ -61,6 +63,15 @@ def event_dist(e1, e2):
return event_seconds(e2) - event_seconds(e1) return event_seconds(e2) - event_seconds(e1)
def check_bitmaps(vm, count):
result = vm.qmp('query-block')
if count == 0:
assert 'dirty-bitmaps' not in result['return'][0]
else:
assert len(result['return'][0]['dirty-bitmaps']) == count
class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase): class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase):
def tearDown(self): def tearDown(self):
if debug: if debug:
@ -101,10 +112,8 @@ class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase):
self.vm_a_events = [] self.vm_a_events = []
self.vm_b_events = [] self.vm_b_events = []
def test_postcopy(self): def start_postcopy(self):
granularity = 512 """ Run migration until RESUME event on target. Return this event. """
nb_bitmaps = 15
for i in range(nb_bitmaps): for i in range(nb_bitmaps):
result = self.vm_a.qmp('block-dirty-bitmap-add', node='drive0', result = self.vm_a.qmp('block-dirty-bitmap-add', node='drive0',
name='bitmap{}'.format(i), name='bitmap{}'.format(i),
@ -119,10 +128,10 @@ class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase):
result = self.vm_a.qmp('x-debug-block-dirty-bitmap-sha256', result = self.vm_a.qmp('x-debug-block-dirty-bitmap-sha256',
node='drive0', name='bitmap0') node='drive0', name='bitmap0')
discards1_sha256 = result['return']['sha256'] self.discards1_sha256 = result['return']['sha256']
# Check, that updating the bitmap by discards works # Check, that updating the bitmap by discards works
assert discards1_sha256 != empty_sha256 assert self.discards1_sha256 != empty_sha256
# We want to calculate resulting sha256. Do it in bitmap0, so, disable # We want to calculate resulting sha256. Do it in bitmap0, so, disable
# other bitmaps # other bitmaps
@ -135,7 +144,7 @@ class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase):
result = self.vm_a.qmp('x-debug-block-dirty-bitmap-sha256', result = self.vm_a.qmp('x-debug-block-dirty-bitmap-sha256',
node='drive0', name='bitmap0') node='drive0', name='bitmap0')
all_discards_sha256 = result['return']['sha256'] self.all_discards_sha256 = result['return']['sha256']
# Now, enable some bitmaps, to be updated during migration # Now, enable some bitmaps, to be updated during migration
for i in range(2, nb_bitmaps, 2): for i in range(2, nb_bitmaps, 2):
@ -160,6 +169,10 @@ class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase):
event_resume = self.vm_b.event_wait('RESUME') event_resume = self.vm_b.event_wait('RESUME')
self.vm_b_events.append(event_resume) self.vm_b_events.append(event_resume)
return event_resume
def test_postcopy_success(self):
event_resume = self.start_postcopy()
# enabled bitmaps should be updated # enabled bitmaps should be updated
apply_discards(self.vm_b, discards2) apply_discards(self.vm_b, discards2)
@ -180,18 +193,15 @@ class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase):
print('downtime:', downtime) print('downtime:', downtime)
print('postcopy_time:', postcopy_time) print('postcopy_time:', postcopy_time)
# Assert that bitmap migration is finished (check that successor bitmap check_bitmaps(self.vm_b, nb_bitmaps)
# is removed)
result = self.vm_b.qmp('query-block')
assert len(result['return'][0]['dirty-bitmaps']) == nb_bitmaps
# Check content of migrated bitmaps. Still, don't waste time checking # Check content of migrated bitmaps. Still, don't waste time checking
# every bitmap # every bitmap
for i in range(0, nb_bitmaps, 5): for i in range(0, nb_bitmaps, 5):
result = self.vm_b.qmp('x-debug-block-dirty-bitmap-sha256', result = self.vm_b.qmp('x-debug-block-dirty-bitmap-sha256',
node='drive0', name='bitmap{}'.format(i)) node='drive0', name='bitmap{}'.format(i))
sha256 = discards1_sha256 if i % 2 else all_discards_sha256 sha = self.discards1_sha256 if i % 2 else self.all_discards_sha256
self.assert_qmp(result, 'return/sha256', sha256) self.assert_qmp(result, 'return/sha256', sha)
if __name__ == '__main__': if __name__ == '__main__':