On 2019-02-06 14:23, Juan Quintela wrote: > We set multifd-channels. > > Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> > Signed-off-by: Juan Quintela <quint...@redhat.com> > --- > tests/migration-test.c | 48 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/tests/migration-test.c b/tests/migration-test.c > index a27f095b28..3e0e447f95 100644 > --- a/tests/migration-test.c > +++ b/tests/migration-test.c > @@ -942,6 +942,53 @@ static void test_precopy_tcp(void) > g_free(uri); > } > > +static void test_multifd_tcp(void) > +{ > + char *uri; > + QTestState *from, *to; > + > + if (test_migrate_start(&from, &to, "tcp:127.0.0.1:0", false)) { > + return; > + } > + > + /* > + * 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. > + */ > + /* 1 ms should make it not converge*/ > + migrate_set_parameter(from, "downtime-limit", 1); > + /* 1GB/s */ > + migrate_set_parameter(from, "max-bandwidth", 1000000000); > + > + migrate_set_parameter(from, "multifd-channels", 2); > + migrate_set_parameter(to, "multifd-channels", 2); > + > + migrate_set_capability(from, "multifd", "true"); > + migrate_set_capability(to, "multifd", "true"); > + /* Wait for the first serial output from the source */ > + wait_for_serial("src_serial"); > + > + uri = migrate_get_socket_address(to, "socket-address"); > + > + migrate(from, uri, "{}"); > + > + wait_for_migration_pass(from); > + > + /* 300ms it should converge */ > + migrate_set_parameter(from, "downtime-limit", 300); > + > + if (!got_stop) { > + qtest_qmp_eventwait(from, "STOP"); > + } > + qtest_qmp_eventwait(to, "RESUME"); > + > + wait_for_serial("dest_serial"); > + wait_for_migration_complete(from); > + > + test_migrate_end(from, to, true); > +} > + > int main(int argc, char **argv) > { > char template[] = "/tmp/migration-test-XXXXXX"; > @@ -995,6 +1042,7 @@ int main(int argc, char **argv) > qtest_add_func("/migration/precopy/unix", test_precopy_unix); > qtest_add_func("/migration/precopy/tcp", test_precopy_tcp); > qtest_add_func("/migration/xbzrle/unix", test_xbzrle_unix); > + qtest_add_func("/migration/multifd/tcp", test_multifd_tcp); > > ret = g_test_run();
Acked-by: Thomas Huth <th...@redhat.com>