| Message ID | 20220524221151.18225-15-peterx@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | migration: Postcopy Preemption | expand |
* Peter Xu (peterx@redhat.com) wrote: > Four tests are added for preempt mode: > > - Postcopy plain > - Postcopy recovery > - Postcopy tls > - Postcopy tls+recovery > > Signed-off-by: Peter Xu <peterx@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > tests/qtest/migration-test.c | 58 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 58 insertions(+) > > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index 12f1e3a751..ca2082a7d9 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -558,6 +558,7 @@ typedef struct { > > /* Postcopy specific fields */ > void *postcopy_data; > + bool postcopy_preempt; > } MigrateCommon; > > static int test_migrate_start(QTestState **from, QTestState **to, > @@ -1063,6 +1064,11 @@ static int migrate_postcopy_prepare(QTestState **from_ptr, > migrate_set_capability(to, "postcopy-ram", true); > migrate_set_capability(to, "postcopy-blocktime", true); > > + if (args->postcopy_preempt) { > + migrate_set_capability(from, "postcopy-preempt", true); > + migrate_set_capability(to, "postcopy-preempt", true); > + } > + > /* We want to pick a speed slow enough that the test completes > * quickly, but that it doesn't complete precopy even on a slow > * machine, so also set the downtime. > @@ -1131,6 +1137,26 @@ static void test_postcopy_tls_psk(void) > test_postcopy_common(&args); > } > > +static void test_postcopy_preempt(void) > +{ > + MigrateCommon args = { > + .postcopy_preempt = true, > + }; > + > + test_postcopy_common(&args); > +} > + > +static void test_postcopy_preempt_tls_psk(void) > +{ > + MigrateCommon args = { > + .postcopy_preempt = true, > + .start_hook = test_migrate_tls_psk_start_match, > + .finish_hook = test_migrate_tls_psk_finish, > + }; > + > + test_postcopy_common(&args); > +} > + > static void test_postcopy_recovery_common(MigrateCommon *args) > { > QTestState *from, *to; > @@ -1210,6 +1236,27 @@ static void test_postcopy_recovery_tls_psk(void) > test_postcopy_recovery_common(&args); > } > > +static void test_postcopy_preempt_recovery(void) > +{ > + MigrateCommon args = { > + .postcopy_preempt = true, > + }; > + > + test_postcopy_recovery_common(&args); > +} > + > +/* This contains preempt+recovery+tls test altogether */ > +static void test_postcopy_preempt_all(void) > +{ > + MigrateCommon args = { > + .postcopy_preempt = true, > + .start_hook = test_migrate_tls_psk_start_match, > + .finish_hook = test_migrate_tls_psk_finish, > + }; > + > + test_postcopy_recovery_common(&args); > +} > + > static void test_baddest(void) > { > MigrateStart args = { > @@ -2194,6 +2241,17 @@ int main(int argc, char **argv) > qtest_add_func("/migration/postcopy/recovery/tls/psk", > test_postcopy_recovery_tls_psk); > #endif /* CONFIG_GNUTLS */ > + > + qtest_add_func("/migration/postcopy/preempt/plain", test_postcopy_preempt); > + qtest_add_func("/migration/postcopy/preempt/recovery/plain", > + test_postcopy_preempt_recovery); > +#ifdef CONFIG_GNUTLS > + qtest_add_func("/migration/postcopy/preempt/tls/psk", > + test_postcopy_preempt_tls_psk); > + qtest_add_func("/migration/postcopy/preempt/recovery/tls/psk", > + test_postcopy_preempt_all); > +#endif /* CONFIG_GNUTLS */ > + > qtest_add_func("/migration/bad_dest", test_baddest); > qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plain); > qtest_add_func("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle); > -- > 2.32.0 >
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 12f1e3a751..ca2082a7d9 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -558,6 +558,7 @@ typedef struct { /* Postcopy specific fields */ void *postcopy_data; + bool postcopy_preempt; } MigrateCommon; static int test_migrate_start(QTestState **from, QTestState **to, @@ -1063,6 +1064,11 @@ static int migrate_postcopy_prepare(QTestState **from_ptr, migrate_set_capability(to, "postcopy-ram", true); migrate_set_capability(to, "postcopy-blocktime", true); + if (args->postcopy_preempt) { + migrate_set_capability(from, "postcopy-preempt", true); + migrate_set_capability(to, "postcopy-preempt", true); + } + /* We want to pick a speed slow enough that the test completes * quickly, but that it doesn't complete precopy even on a slow * machine, so also set the downtime. @@ -1131,6 +1137,26 @@ static void test_postcopy_tls_psk(void) test_postcopy_common(&args); } +static void test_postcopy_preempt(void) +{ + MigrateCommon args = { + .postcopy_preempt = true, + }; + + test_postcopy_common(&args); +} + +static void test_postcopy_preempt_tls_psk(void) +{ + MigrateCommon args = { + .postcopy_preempt = true, + .start_hook = test_migrate_tls_psk_start_match, + .finish_hook = test_migrate_tls_psk_finish, + }; + + test_postcopy_common(&args); +} + static void test_postcopy_recovery_common(MigrateCommon *args) { QTestState *from, *to; @@ -1210,6 +1236,27 @@ static void test_postcopy_recovery_tls_psk(void) test_postcopy_recovery_common(&args); } +static void test_postcopy_preempt_recovery(void) +{ + MigrateCommon args = { + .postcopy_preempt = true, + }; + + test_postcopy_recovery_common(&args); +} + +/* This contains preempt+recovery+tls test altogether */ +static void test_postcopy_preempt_all(void) +{ + MigrateCommon args = { + .postcopy_preempt = true, + .start_hook = test_migrate_tls_psk_start_match, + .finish_hook = test_migrate_tls_psk_finish, + }; + + test_postcopy_recovery_common(&args); +} + static void test_baddest(void) { MigrateStart args = { @@ -2194,6 +2241,17 @@ int main(int argc, char **argv) qtest_add_func("/migration/postcopy/recovery/tls/psk", test_postcopy_recovery_tls_psk); #endif /* CONFIG_GNUTLS */ + + qtest_add_func("/migration/postcopy/preempt/plain", test_postcopy_preempt); + qtest_add_func("/migration/postcopy/preempt/recovery/plain", + test_postcopy_preempt_recovery); +#ifdef CONFIG_GNUTLS + qtest_add_func("/migration/postcopy/preempt/tls/psk", + test_postcopy_preempt_tls_psk); + qtest_add_func("/migration/postcopy/preempt/recovery/tls/psk", + test_postcopy_preempt_all); +#endif /* CONFIG_GNUTLS */ + qtest_add_func("/migration/bad_dest", test_baddest); qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plain); qtest_add_func("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle);
Four tests are added for preempt mode: - Postcopy plain - Postcopy recovery - Postcopy tls - Postcopy tls+recovery Signed-off-by: Peter Xu <peterx@redhat.com> --- tests/qtest/migration-test.c | 58 ++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)