qemu-iotests: fix 203 migration completion race
There is a race between the test's 'query-migrate' QMP command after the QMP 'STOP' event and completing the migration: The test case invokes 'query-migrate' upon receiving 'STOP'. At this point the migration thread may still be in the process of completing. Therefore 'query-migrate' can return 'status': 'active' for a brief window of time instead of 'status': 'completed'. This results in qemu-iotests 203 hanging. Solve the race by enabling the 'events' migration capability, which causes QEMU to emit migration-specific QMP events that do not suffer from this race condition. Wait for the QMP 'MIGRATION' event with 'status': 'completed'. Reported-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 20180305155926.25858-1-stefanha@redhat.com Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
39eaefcedb
commit
21794244d4
|
@ -49,11 +49,18 @@ with iotests.FilePath('disk0.img') as disk0_img_path, \
|
||||||
node_name='drive1-node', iothread='iothread0',
|
node_name='drive1-node', iothread='iothread0',
|
||||||
force=True))
|
force=True))
|
||||||
|
|
||||||
|
iotests.log('Enabling migration QMP events...')
|
||||||
|
iotests.log(vm.qmp('migrate-set-capabilities', capabilities=[
|
||||||
|
{
|
||||||
|
'capability': 'events',
|
||||||
|
'state': True
|
||||||
|
}
|
||||||
|
]))
|
||||||
|
|
||||||
iotests.log('Starting migration...')
|
iotests.log('Starting migration...')
|
||||||
iotests.log(vm.qmp('migrate', uri='exec:cat >/dev/null'))
|
iotests.log(vm.qmp('migrate', uri='exec:cat >/dev/null'))
|
||||||
while True:
|
while True:
|
||||||
vm.get_qmp_event(wait=60.0)
|
event = vm.event_wait('MIGRATION')
|
||||||
result = vm.qmp('query-migrate')
|
iotests.log(event, filters=[iotests.filter_qmp_event])
|
||||||
status = result.get('return', {}).get('status', None)
|
if event['data']['status'] == 'completed':
|
||||||
if status == 'completed':
|
|
||||||
break
|
break
|
||||||
|
|
|
@ -2,5 +2,10 @@ Launching VM...
|
||||||
Setting IOThreads...
|
Setting IOThreads...
|
||||||
{u'return': {}}
|
{u'return': {}}
|
||||||
{u'return': {}}
|
{u'return': {}}
|
||||||
|
Enabling migration QMP events...
|
||||||
|
{u'return': {}}
|
||||||
Starting migration...
|
Starting migration...
|
||||||
{u'return': {}}
|
{u'return': {}}
|
||||||
|
{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'setup'}, u'event': u'MIGRATION'}
|
||||||
|
{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'active'}, u'event': u'MIGRATION'}
|
||||||
|
{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'completed'}, u'event': u'MIGRATION'}
|
||||||
|
|
Loading…
Reference in a new issue