| Message ID | 20230426081601.2567990-1-eesposit@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/unit/test-blockjob: Re-enable complete_in_standby test | expand |
On 26/04/2023 10.16, Emanuele Giuseppe Esposito wrote: > Pause the job while draining so that pause_count will be > increased and bdrv_drain_all_end() won't reset it to 0, so the > job will not continue. > > With this fix, the test is not flaky anymore. > > Additionally remove useless aiocontext lock around bdrv_drain_all_end() > in test_complete_in_standby(). > > Fixes: b6903cbe3a2 "tests/unit/test-blockjob: Disable > complete_in_standby test" > Suggested-by: Hanna Czenczek <hreitz@redhat.com> > Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> > --- > tests/unit/test-blockjob.c | 17 +++++++---------- > 1 file changed, 7 insertions(+), 10 deletions(-) > > diff --git a/tests/unit/test-blockjob.c b/tests/unit/test-blockjob.c > index a130f6fefb..46d720aeee 100644 > --- a/tests/unit/test-blockjob.c > +++ b/tests/unit/test-blockjob.c > @@ -488,11 +488,15 @@ static void test_complete_in_standby(void) > bdrv_drain_all_begin(); > assert_job_status_is(job, JOB_STATUS_STANDBY); > > + /* > + * Increase pause_count so that the counter is > + * unbalanced and job won't resume > + */ > + job_pause(job); > + > /* Lock the IO thread to prevent the job from being run */ I guess the above comment should now be removed, too? > - aio_context_acquire(ctx); > /* This will schedule the job to resume it */ > bdrv_drain_all_end(); > - aio_context_release(ctx); Thomas
Am 26/04/2023 um 10:45 schrieb Thomas Huth: > On 26/04/2023 10.16, Emanuele Giuseppe Esposito wrote: >> Pause the job while draining so that pause_count will be >> increased and bdrv_drain_all_end() won't reset it to 0, so the >> job will not continue. >> >> With this fix, the test is not flaky anymore. >> >> Additionally remove useless aiocontext lock around bdrv_drain_all_end() >> in test_complete_in_standby(). >> >> Fixes: b6903cbe3a2 "tests/unit/test-blockjob: Disable >> complete_in_standby test" >> Suggested-by: Hanna Czenczek <hreitz@redhat.com> >> Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> >> --- >> tests/unit/test-blockjob.c | 17 +++++++---------- >> 1 file changed, 7 insertions(+), 10 deletions(-) >> >> diff --git a/tests/unit/test-blockjob.c b/tests/unit/test-blockjob.c >> index a130f6fefb..46d720aeee 100644 >> --- a/tests/unit/test-blockjob.c >> +++ b/tests/unit/test-blockjob.c >> @@ -488,11 +488,15 @@ static void test_complete_in_standby(void) >> bdrv_drain_all_begin(); >> assert_job_status_is(job, JOB_STATUS_STANDBY); >> + /* >> + * Increase pause_count so that the counter is >> + * unbalanced and job won't resume >> + */ >> + job_pause(job); >> + >> /* Lock the IO thread to prevent the job from being run */ > > I guess the above comment should now be removed, too? > >> - aio_context_acquire(ctx); >> /* This will schedule the job to resume it */ >> bdrv_drain_all_end(); >> - aio_context_release(ctx); > > Thomas > Makes sense, resending Emanuele
diff --git a/tests/unit/test-blockjob.c b/tests/unit/test-blockjob.c index a130f6fefb..46d720aeee 100644 --- a/tests/unit/test-blockjob.c +++ b/tests/unit/test-blockjob.c @@ -488,11 +488,15 @@ static void test_complete_in_standby(void) bdrv_drain_all_begin(); assert_job_status_is(job, JOB_STATUS_STANDBY); + /* + * Increase pause_count so that the counter is + * unbalanced and job won't resume + */ + job_pause(job); + /* Lock the IO thread to prevent the job from being run */ - aio_context_acquire(ctx); /* This will schedule the job to resume it */ bdrv_drain_all_end(); - aio_context_release(ctx); WITH_JOB_LOCK_GUARD() { /* But the job cannot run, so it will remain on standby */ @@ -531,13 +535,6 @@ int main(int argc, char **argv) g_test_add_func("/blockjob/cancel/standby", test_cancel_standby); g_test_add_func("/blockjob/cancel/pending", test_cancel_pending); g_test_add_func("/blockjob/cancel/concluded", test_cancel_concluded); - - /* - * This test is flaky and sometimes fails in CI and otherwise: - * don't run unless user opts in via environment variable. - */ - if (getenv("QEMU_TEST_FLAKY_TESTS")) { - g_test_add_func("/blockjob/complete_in_standby", test_complete_in_standby); - } + g_test_add_func("/blockjob/complete_in_standby", test_complete_in_standby); return g_test_run(); }
Pause the job while draining so that pause_count will be increased and bdrv_drain_all_end() won't reset it to 0, so the job will not continue. With this fix, the test is not flaky anymore. Additionally remove useless aiocontext lock around bdrv_drain_all_end() in test_complete_in_standby(). Fixes: b6903cbe3a2 "tests/unit/test-blockjob: Disable complete_in_standby test" Suggested-by: Hanna Czenczek <hreitz@redhat.com> Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com> --- tests/unit/test-blockjob.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)