| Message ID | 20230421171411.566300-7-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests/qtest: make migration-test massively faster | expand |
> -----Original Message----- > From: Daniel P. Berrangé <berrange@redhat.com> > Sent: Saturday, April 22, 2023 1:14 AM > To: qemu-devel@nongnu.org > Cc: qemu-block@nongnu.org; Paolo Bonzini <pbonzini@redhat.com>; > Thomas Huth <thuth@redhat.com>; John Snow <jsnow@redhat.com>; Li > Zhijian <lizhijian@fujitsu.com>; Juan Quintela <quintela@redhat.com>; > Stefan Hajnoczi <stefanha@redhat.com>; Zhang, Chen > <chen.zhang@intel.com>; Laurent Vivier <lvivier@redhat.com> > Subject: [PATCH v2 6/6] tests/migration: Only run auto_converge in slow > mode > What kind of scenario will the qtest open this g_test_init() -m slow to trigger the slow mode? Thanks Chen > From: Juan Quintela <quintela@redhat.com> > > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > tests/qtest/migration-test.c | 23 +++++++++++++++++++++-- > 1 file changed, 21 insertions(+), 2 deletions(-) > > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index > 63bd8a1893..9ed178aa03 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -1877,6 +1877,21 @@ static void test_validate_uuid_dst_not_set(void) > do_test_validate_uuid(&args, false); } > > +/* > + * The way auto_converge works, we need to do too many passes to > + * run this test. Auto_converge logic is only run once every > + * three iterations, so: > + * > + * - 3 iterations without auto_converge enabled > + * - 3 iterations with pct = 5 > + * - 3 iterations with pct = 30 > + * - 3 iterations with pct = 55 > + * - 3 iterations with pct = 80 > + * - 3 iterations with pct = 95 (max(95, 80 + 25)) > + * > + * To make things even worse, we need to run the initial stage at > + * 3MB/s so we enter autoconverge even when host is (over)loaded. > + */ > static void test_migrate_auto_converge(void) { > g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); @@ - > 2660,8 +2675,12 @@ int main(int argc, char **argv) > test_validate_uuid_src_not_set); > qtest_add_func("/migration/validate_uuid_dst_not_set", > test_validate_uuid_dst_not_set); > - > - qtest_add_func("/migration/auto_converge", > test_migrate_auto_converge); > + /* > + * See explanation why this test is slow on function definition > + */ > + if (g_test_slow()) { > + qtest_add_func("/migration/auto_converge", > test_migrate_auto_converge); > + } > qtest_add_func("/migration/multifd/tcp/plain/none", > test_multifd_tcp_none); > /* > -- > 2.40.0
"Zhang, Chen" <chen.zhang@intel.com> wrote: >> -----Original Message----- >> From: Daniel P. Berrangé <berrange@redhat.com> >> Sent: Saturday, April 22, 2023 1:14 AM >> To: qemu-devel@nongnu.org >> Cc: qemu-block@nongnu.org; Paolo Bonzini <pbonzini@redhat.com>; >> Thomas Huth <thuth@redhat.com>; John Snow <jsnow@redhat.com>; Li >> Zhijian <lizhijian@fujitsu.com>; Juan Quintela <quintela@redhat.com>; >> Stefan Hajnoczi <stefanha@redhat.com>; Zhang, Chen >> <chen.zhang@intel.com>; Laurent Vivier <lvivier@redhat.com> >> Subject: [PATCH v2 6/6] tests/migration: Only run auto_converge in slow >> mode >> > > What kind of scenario will the qtest open this g_test_init() -m slow to trigger the slow mode? The only way that I know is: export G_TEST_SLOW=1 make check (or whatever individual test that you want) Later, Juan.
On 24/04/2023 07.58, Juan Quintela wrote: > "Zhang, Chen" <chen.zhang@intel.com> wrote: >>> -----Original Message----- >>> From: Daniel P. Berrangé <berrange@redhat.com> >>> Sent: Saturday, April 22, 2023 1:14 AM >>> To: qemu-devel@nongnu.org >>> Cc: qemu-block@nongnu.org; Paolo Bonzini <pbonzini@redhat.com>; >>> Thomas Huth <thuth@redhat.com>; John Snow <jsnow@redhat.com>; Li >>> Zhijian <lizhijian@fujitsu.com>; Juan Quintela <quintela@redhat.com>; >>> Stefan Hajnoczi <stefanha@redhat.com>; Zhang, Chen >>> <chen.zhang@intel.com>; Laurent Vivier <lvivier@redhat.com> >>> Subject: [PATCH v2 6/6] tests/migration: Only run auto_converge in slow >>> mode >>> >> >> What kind of scenario will the qtest open this g_test_init() -m slow to trigger the slow mode? > > The only way that I know is: > > export G_TEST_SLOW=1 > make check (or whatever individual test that you want) Or even simpler: make check SPEED=slow Or if you want to run the test manually: QTEST_QEMU_BINARY=./qemu-system-x86_64 \ tests/qtest/migration-test -m slow HTH, Thomas
> -----Original Message----- > From: Thomas Huth <thuth@redhat.com> > Sent: Monday, April 24, 2023 2:56 PM > To: quintela@redhat.com; Zhang, Chen <chen.zhang@intel.com> > Cc: Daniel P. Berrangé <berrange@redhat.com>; qemu-devel@nongnu.org; > qemu-block@nongnu.org; Paolo Bonzini <pbonzini@redhat.com>; John > Snow <jsnow@redhat.com>; Li Zhijian <lizhijian@fujitsu.com>; Stefan > Hajnoczi <stefanha@redhat.com>; Laurent Vivier <lvivier@redhat.com> > Subject: Re: [PATCH v2 6/6] tests/migration: Only run auto_converge in slow > mode > > On 24/04/2023 07.58, Juan Quintela wrote: > > "Zhang, Chen" <chen.zhang@intel.com> wrote: > >>> -----Original Message----- > >>> From: Daniel P. Berrangé <berrange@redhat.com> > >>> Sent: Saturday, April 22, 2023 1:14 AM > >>> To: qemu-devel@nongnu.org > >>> Cc: qemu-block@nongnu.org; Paolo Bonzini <pbonzini@redhat.com>; > >>> Thomas Huth <thuth@redhat.com>; John Snow <jsnow@redhat.com>; Li > >>> Zhijian <lizhijian@fujitsu.com>; Juan Quintela > >>> <quintela@redhat.com>; Stefan Hajnoczi <stefanha@redhat.com>; > Zhang, > >>> Chen <chen.zhang@intel.com>; Laurent Vivier <lvivier@redhat.com> > >>> Subject: [PATCH v2 6/6] tests/migration: Only run auto_converge in > >>> slow mode > >>> > >> > >> What kind of scenario will the qtest open this g_test_init() -m slow to > trigger the slow mode? > > > > The only way that I know is: > > > > export G_TEST_SLOW=1 > > make check (or whatever individual test that you want) > > Or even simpler: > > make check SPEED=slow > > Or if you want to run the test manually: > > QTEST_QEMU_BINARY=./qemu-system-x86_64 \ > tests/qtest/migration-test -m slow > Thanks for the explanation. Thanks Chen > HTH, > Thomas
> -----Original Message----- > From: Daniel P. Berrangé <berrange@redhat.com> > Sent: Saturday, April 22, 2023 1:14 AM > To: qemu-devel@nongnu.org > Cc: qemu-block@nongnu.org; Paolo Bonzini <pbonzini@redhat.com>; > Thomas Huth <thuth@redhat.com>; John Snow <jsnow@redhat.com>; Li > Zhijian <lizhijian@fujitsu.com>; Juan Quintela <quintela@redhat.com>; > Stefan Hajnoczi <stefanha@redhat.com>; Zhang, Chen > <chen.zhang@intel.com>; Laurent Vivier <lvivier@redhat.com> > Subject: [PATCH v2 6/6] tests/migration: Only run auto_converge in slow > mode > > From: Juan Quintela <quintela@redhat.com> > > Signed-off-by: Juan Quintela <quintela@redhat.com> LGTM. Reviewed-by: Zhang Chen <chen.zhang@intel.com> > --- > tests/qtest/migration-test.c | 23 +++++++++++++++++++++-- > 1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 63bd8a1893..9ed178aa03 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1877,6 +1877,21 @@ static void test_validate_uuid_dst_not_set(void) do_test_validate_uuid(&args, false); } +/* + * The way auto_converge works, we need to do too many passes to + * run this test. Auto_converge logic is only run once every + * three iterations, so: + * + * - 3 iterations without auto_converge enabled + * - 3 iterations with pct = 5 + * - 3 iterations with pct = 30 + * - 3 iterations with pct = 55 + * - 3 iterations with pct = 80 + * - 3 iterations with pct = 95 (max(95, 80 + 25)) + * + * To make things even worse, we need to run the initial stage at + * 3MB/s so we enter autoconverge even when host is (over)loaded. + */ static void test_migrate_auto_converge(void) { g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); @@ -2660,8 +2675,12 @@ int main(int argc, char **argv) test_validate_uuid_src_not_set); qtest_add_func("/migration/validate_uuid_dst_not_set", test_validate_uuid_dst_not_set); - - qtest_add_func("/migration/auto_converge", test_migrate_auto_converge); + /* + * See explanation why this test is slow on function definition + */ + if (g_test_slow()) { + qtest_add_func("/migration/auto_converge", test_migrate_auto_converge); + } qtest_add_func("/migration/multifd/tcp/plain/none", test_multifd_tcp_none); /*