mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iotests.py: rewrite run_job to be pickier

Browse Source 
Don't pull events out of the queue that don't belong to us;
be choosier so that we can use this method to drive jobs that
were launched by transactions that may have more jobs.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20190523170643.20794-5-jsnow@redhat.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
John Snow 2019-05-23 13:06:42 -04:00 committed by Max Reitz
parent f6f4b3f045
commit d6a79af0e6
1 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tests/qemu-iotests/iotests.py
View File

@ -543,27 +543,37 @@ class VM(qtest.QEMUQtestMachine):
# Returns None on success, and an error string on failure # Returns None on success, and an error string on failure
def run_job(self, job, auto_finalize=True, auto_dismiss=False, def run_job(self, job, auto_finalize=True, auto_dismiss=False,
pre_finalize=None, wait=60.0): pre_finalize=None, wait=60.0):
match_device = {'data': {'device': job}}
match_id = {'data': {'id': job}}
events = [
('BLOCK_JOB_COMPLETED', match_device),
('BLOCK_JOB_CANCELLED', match_device),
('BLOCK_JOB_ERROR', match_device),
('BLOCK_JOB_READY', match_device),
('BLOCK_JOB_PENDING', match_id),
('JOB_STATUS_CHANGE', match_id)
]
error = None error = None
while True: while True:
for ev in self.get_qmp_events_filtered(wait=wait): ev = filter_qmp_event(self.events_wait(events))
if ev['event'] == 'JOB_STATUS_CHANGE': if ev['event'] != 'JOB_STATUS_CHANGE':
status = ev['data']['status'] log(ev)
if status == 'aborting': continue
result = self.qmp('query-jobs') status = ev['data']['status']
for j in result['return']: if status == 'aborting':
if j['id'] == job: result = self.qmp('query-jobs')
error = j['error'] for j in result['return']:
log('Job failed: %s' % (j['error'])) if j['id'] == job:
elif status == 'pending' and not auto_finalize: error = j['error']
if pre_finalize: log('Job failed: %s' % (j['error']))
pre_finalize() elif status == 'pending' and not auto_finalize:
self.qmp_log('job-finalize', id=job) if pre_finalize:
elif status == 'concluded' and not auto_dismiss: pre_finalize()
self.qmp_log('job-dismiss', id=job) self.qmp_log('job-finalize', id=job)
elif status == 'null': elif status == 'concluded' and not auto_dismiss:
return error self.qmp_log('job-dismiss', id=job)
else: elif status == 'null':
log(ev) return error
def node_info(self, node_name): def node_info(self, node_name):
nodes = self.qmp('query-named-block-nodes') nodes = self.qmp('query-named-block-nodes')