Skip to content

Commit

Permalink
Merge pull request ceph#21131 from trociny/wip-23502
Browse files Browse the repository at this point in the history
qa/suites/rbd: set qemu task time_wait param

Reviewed-by: Jason Dillaman <[email protected]>
  • Loading branch information
Jason Dillaman authored Mar 29, 2018
2 parents 388303f + 6fe8d64 commit 4e36277
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions qa/suites/rbd/maintenance/qemu/xfstests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ io_workload:
clone: true
type: block
disks: 3
time_wait: 120
test: http://git.ceph.com/?p={repo};a=blob_plain;hb={branch};f=qa/run_xfstests_qemu.sh
exclude_arch: armv7l
7 changes: 7 additions & 0 deletions qa/tasks/qemu.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import logging
import os
import yaml
import time

from teuthology import misc as teuthology
from teuthology import contextutil
Expand Down Expand Up @@ -407,6 +408,7 @@ def run_qemu(ctx, config):
cachemode=cachemode,
),
])
time_wait = client_config.get('time_wait', 0)

log.info('starting qemu...')
procs.append(
Expand All @@ -424,6 +426,11 @@ def run_qemu(ctx, config):
log.info('waiting for qemu tests to finish...')
run.wait(procs)

if time_wait > 0:
log.debug('waiting {time_wait} sec for workloads detect finish...'.format(
time_wait=time_wait));
time.sleep(time_wait)

log.debug('checking that qemu tests succeeded...')
for client in config.iterkeys():
(remote,) = ctx.cluster.only(client).remotes.keys()
Expand Down

0 comments on commit 4e36277

Please sign in to comment.