On Tue, May 17, 2022 at 03:57:28PM -0400, Peter Xu wrote:
> We just added TLS tests for precopy but not postcopy. Add the
> corresponding test for vanilla postcopy.
>
> Rename the vanilla postcopy to "postcopy/plain" because all postcopy tests
> will only use unix sockets as channel.
>
> Signed-off-by: Peter Xu <pet...@redhat.com>
> ---
> tests/qtest/migration-test.c | 50 +++++++++++++++++++++++++++++++-----
> 1 file changed, 43 insertions(+), 7 deletions(-)
>
> diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
> index d33e8060f9..e8304aa454 100644
> --- a/tests/qtest/migration-test.c
> +++ b/tests/qtest/migration-test.c
> @@ -481,6 +481,10 @@ typedef struct {
> bool only_target;
> /* Use dirty ring if true; dirty logging otherwise */
> bool use_dirty_ring;
> + /* Whether use TLS channels for postcopy test? */
> + bool postcopy_tls;
> + /* Used only if postcopy_tls==true, to cache the data object */
> + void *postcopy_tls_data;
Rather than adding these fields, I think it would be preferrable to
pass the hooks in the same way I did for the precopy tests.
> const char *opts_source;
> const char *opts_target;
> } MigrateStart;
> @@ -980,6 +984,10 @@ static int migrate_postcopy_prepare(QTestState
> **from_ptr,
> return -1;
Add 'TestMigrateStartHook start_hook' to this method
> }
>
> + if (args->postcopy_tls) {
> + args->postcopy_tls_data = test_migrate_tls_psk_start_match(from, to);
> + }
call the 'start_hook'
> +
> migrate_set_capability(from, "postcopy-ram", true);
> migrate_set_capability(to, "postcopy-ram", true);
> migrate_set_capability(to, "postcopy-blocktime", true);
> @@ -1004,7 +1012,8 @@ static int migrate_postcopy_prepare(QTestState
> **from_ptr,
> return 0;
> }
>
> -static void migrate_postcopy_complete(QTestState *from, QTestState *to)
> +static void migrate_postcopy_complete(QTestState *from, QTestState *to,
> + MigrateStart *args)
Here pass in the TestMigrateFinishHook , and the void* data
from the migrate_postcoy_prepare method.
> {
> wait_for_migration_complete(from);
>
> @@ -1015,19 +1024,38 @@ static void migrate_postcopy_complete(QTestState
> *from, QTestState *to)
> read_blocktime(to);
> }
>
> + if (args->postcopy_tls) {
> + assert(args->postcopy_tls_data);
> + test_migrate_tls_psk_finish(from, to, args->postcopy_tls_data);
> + args->postcopy_tls_data = NULL;
> + }
> +
> test_migrate_end(from, to, true);
> }
>
> -static void test_postcopy(void)
> +static void test_postcopy_common(MigrateStart *args)
Use 'MigrateCommon' here, which embeds a copy of 'MigrateStart',
while also having fields to the TestMigrateStartHook and
TestMigrateFinishHook.
> {
> - MigrateStart args = {};
> QTestState *from, *to;
>
> - if (migrate_postcopy_prepare(&from, &to, &args)) {
> + if (migrate_postcopy_prepare(&from, &to, args)) {
> return;
> }
> migrate_postcopy_start(from, to);
> - migrate_postcopy_complete(from, to);
> + migrate_postcopy_complete(from, to, args);
eg this would become
void *hook_data;
if (migrate_postcopy_prepare(&from, &to, args.start_hook, &hook_data)) {
return;
}
migrate_postcopy_start(from, to);
migrate_postcopy_complete(from, to, args.finish_hook, hook_data);
> +}
> +
> +static void test_postcopy(void)
> +{
> + MigrateStart args = { };
MigrateCommon args = {}
> +
> + test_postcopy_common(&args);
> +}
> +
> +static void test_postcopy_tls_psk(void)
> +{
> + MigrateStart args = { .postcopy_tls = true };
MigrateCommon args = {
.start_hook = test_migrate_tls_psk_start_match,
.finish_hook = test_migrate_tls_psk_finish,
}
> +
> + test_postcopy_common(&args);
> }
>
> static void test_postcopy_recovery(void)
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
