Skip to contentSkip to conversation

tests/unit/test-blockjob: Re-enable complete_in_standby test

PATCH Superseded Emanuele Giuseppe Esposito 2 participants 3 messages Apr 26, 2023

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/unit/test-blockjob: Re-enable complete_in_standby test

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"

---
 tests/unit/test-blockjob.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)
tests/unit/test-blockjob.c +7 -10
index a130f6fefb..46d720aeee 100644
@@ -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();
 }
Signature · 1 line
2.39.1
#1 lore raw
Quoted 22 lines · Emanuele Giuseppe Esposito

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"

---
  tests/unit/test-blockjob.c | 17 +++++++----------
  1 file changed, 7 insertions(+), 10 deletions(-)
tests/unit/test-blockjob.c +0 -0
index a130f6fefb..46d720aeee 100644

tests/unit/test-blockjob.c static void test_complete_in_standby(void) · line 497

Quoted 10 lines
tests/unit/test-blockjob.c +6 -0
@@ -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?

tests/unit/test-blockjob.c static void test_complete_in_standby(void) · line 495

Quoted 4 lines
tests/unit/test-blockjob.c +0 -2
-    aio_context_acquire(ctx);
      /* This will schedule the job to resume it */
      bdrv_drain_all_end();
-    aio_context_release(ctx);

Thomas

#2 lore raw

Am 26/04/2023 um 10:45 schrieb Thomas Huth:

Quoted 35 lines · Emanuele Giuseppe Esposito
Quoted 24 lines

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"

---
  tests/unit/test-blockjob.c | 17 +++++++----------

  1 file changed, 7 insertions(+), 10 deletions(-)
tests/unit/test-blockjob.c +0 -0
index a130f6fefb..46d720aeee 100644
@@ -488,11 +488,15 @@ static void test_complete_in_standby(void)
       bdrv_drain_all_begin();
       assert_job_status_is(job, JOB_STATUS_STANDBY);
Quoted 7 lines

  +    /*
+     * 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?

Quoted 7 lines
Quoted 4 lines

-    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