| Message ID | 20180920161958.27453-18-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fix some jobs/drain/aio_poll related hangs | expand |
On 9/20/18 11:19 AM, Kevin Wolf wrote: > Commit 89bd030533e changed the test case from using job_sleep_ns() to > using qemu_co_sleep_ns() instead. Also, block_job_sleep_ns() became > job_sleep_ns() in commit 5d43e86e11f. > > In both cases, some comments in the test case were not updated. Do that > now. > > Reported-by: Max Reitz <mreitz@redhat.com> > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > tests/test-bdrv-drain.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > +++ b/tests/test-bdrv-drain.c > @@ -820,9 +820,9 @@ static int coroutine_fn test_job_run(Job *job, Error **errp) > > job_transition_to_ready(&s->common.job); > while (!s->should_complete) { > - /* Avoid block_job_sleep_ns() because it marks the job as !busy. We > - * want to emulate some actual activity (probably some I/O) here so > - * that drain has to wait for this acitivity to stop. */ > + /* Avoid job_sleep_ns() because it marks the job as !busy. We want to > + * emulate some actual activity (probably some I/O) here so that drain > + * has to wait for this acitivity to stop. */ Fix the pre-existing typo while you're here: s/acitivity/activity/ With that, Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c index bbc56a055f..526978a8ac 100644 --- a/tests/test-bdrv-drain.c +++ b/tests/test-bdrv-drain.c @@ -820,9 +820,9 @@ static int coroutine_fn test_job_run(Job *job, Error **errp) job_transition_to_ready(&s->common.job); while (!s->should_complete) { - /* Avoid block_job_sleep_ns() because it marks the job as !busy. We - * want to emulate some actual activity (probably some I/O) here so - * that drain has to wait for this acitivity to stop. */ + /* Avoid job_sleep_ns() because it marks the job as !busy. We want to + * emulate some actual activity (probably some I/O) here so that drain + * has to wait for this acitivity to stop. */ qemu_co_sleep_ns(QEMU_CLOCK_REALTIME, 100000); job_pause_point(&s->common.job); } @@ -908,7 +908,7 @@ static void test_blockjob_common(enum drain_type drain_type, bool use_iothread, g_assert_cmpint(job->job.pause_count, ==, 0); g_assert_false(job->job.paused); - g_assert_true(job->job.busy); /* We're in job_sleep_ns() */ + g_assert_true(job->job.busy); /* We're in qemu_co_sleep_ns() */ do_drain_begin_unlocked(drain_type, src); @@ -956,7 +956,7 @@ static void test_blockjob_common(enum drain_type drain_type, bool use_iothread, g_assert_cmpint(job->job.pause_count, ==, 0); g_assert_false(job->job.paused); - g_assert_true(job->job.busy); /* We're in job_sleep_ns() */ + g_assert_true(job->job.busy); /* We're in qemu_co_sleep_ns() */ aio_context_acquire(ctx); ret = job_complete_sync(&job->job, &error_abort);
Commit 89bd030533e changed the test case from using job_sleep_ns() to using qemu_co_sleep_ns() instead. Also, block_job_sleep_ns() became job_sleep_ns() in commit 5d43e86e11f. In both cases, some comments in the test case were not updated. Do that now. Reported-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- tests/test-bdrv-drain.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)