We set multifd-channels.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Wei Yang <richardw.yang@linux.intel.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/migration-test.c | 56 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/tests/migration-test.c b/tests/migration-test.c
index 53afec4395..1a8d06718e 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -1202,6 +1202,61 @@ static void test_migrate_auto_converge(void)
test_migrate_end(from, to, true);
}
+static void test_multifd_tcp(void)
+{
+ MigrateStart *args = migrate_start_new();
+ QTestState *from, *to;
+ QDict *rsp;
+ char *uri;
+
+ if (test_migrate_start(&from, &to, "defer", args)) {
+ 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_int(from, "downtime-limit", 1);
+ /* 1GB/s */
+ migrate_set_parameter_int(from, "max-bandwidth", 1000000000);
+
+ migrate_set_parameter_int(from, "multifd-channels", 16);
+ migrate_set_parameter_int(to, "multifd-channels", 16);
+
+ migrate_set_capability(from, "multifd", "true");
+ migrate_set_capability(to, "multifd", "true");
+
+ /* Start incoming migration from the 1st socket */
+ rsp = wait_command(to, "{ 'execute': 'migrate-incoming',"
+ " 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}");
+ qobject_unref(rsp);
+
+ /* Wait for the first serial output from the source */
+ wait_for_serial("src_serial");
+
+ uri = migrate_get_socket_address(to, "socket-address");
+
+ migrate_qmp(from, uri, "{}");
+
+ wait_for_migration_pass(from);
+
+ /* 300ms it should converge */
+ migrate_set_parameter_int(from, "downtime-limit", 600);
+
+ 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);
+ free(uri);
+}
+
int main(int argc, char **argv)
{
char template[] = "/tmp/migration-test-XXXXXX";
@@ -1266,6 +1321,7 @@ int main(int argc, char **argv)
test_validate_uuid_dst_not_set);
qtest_add_func("/migration/auto_converge", test_migrate_auto_converge);
+ qtest_add_func("/migration/multifd/tcp", test_multifd_tcp);
ret = g_test_run();
--
2.24.1
* Juan Quintela (quintela@redhat.com) wrote:
> We set multifd-channels.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> Tested-by: Wei Yang <richardw.yang@linux.intel.com>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
> tests/migration-test.c | 56 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 56 insertions(+)
>
> diff --git a/tests/migration-test.c b/tests/migration-test.c
> index 53afec4395..1a8d06718e 100644
> --- a/tests/migration-test.c
> +++ b/tests/migration-test.c
> @@ -1202,6 +1202,61 @@ static void test_migrate_auto_converge(void)
> test_migrate_end(from, to, true);
> }
>
> +static void test_multifd_tcp(void)
> +{
> + MigrateStart *args = migrate_start_new();
> + QTestState *from, *to;
> + QDict *rsp;
> + char *uri;
> +
> + if (test_migrate_start(&from, &to, "defer", args)) {
> + 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_int(from, "downtime-limit", 1);
> + /* 1GB/s */
> + migrate_set_parameter_int(from, "max-bandwidth", 1000000000);
> +
> + migrate_set_parameter_int(from, "multifd-channels", 16);
> + migrate_set_parameter_int(to, "multifd-channels", 16);
> +
> + migrate_set_capability(from, "multifd", "true");
> + migrate_set_capability(to, "multifd", "true");
> +
> + /* Start incoming migration from the 1st socket */
> + rsp = wait_command(to, "{ 'execute': 'migrate-incoming',"
> + " 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}");
> + qobject_unref(rsp);
> +
> + /* Wait for the first serial output from the source */
> + wait_for_serial("src_serial");
> +
> + uri = migrate_get_socket_address(to, "socket-address");
> +
> + migrate_qmp(from, uri, "{}");
> +
> + wait_for_migration_pass(from);
> +
> + /* 300ms it should converge */
> + migrate_set_parameter_int(from, "downtime-limit", 600);
Comment doesn't quite match here; but other than that;
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> + 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);
> + free(uri);
> +}
> +
> int main(int argc, char **argv)
> {
> char template[] = "/tmp/migration-test-XXXXXX";
> @@ -1266,6 +1321,7 @@ int main(int argc, char **argv)
> test_validate_uuid_dst_not_set);
>
> qtest_add_func("/migration/auto_converge", test_migrate_auto_converge);
> + qtest_add_func("/migration/multifd/tcp", test_multifd_tcp);
>
> ret = g_test_run();
>
> --
> 2.24.1
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
"Dr. David Alan Gilbert" <dgilbert@redhat.com> wrote:
> * Juan Quintela (quintela@redhat.com) wrote:
>> We set multifd-channels.
>>
>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>> Reviewed-by: Thomas Huth <thuth@redhat.com>
>> Tested-by: Wei Yang <richardw.yang@linux.intel.com>
>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>> ---
>> tests/migration-test.c | 56 ++++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 56 insertions(+)
>>
>> diff --git a/tests/migration-test.c b/tests/migration-test.c
>> index 53afec4395..1a8d06718e 100644
>> --- a/tests/migration-test.c
>> +++ b/tests/migration-test.c
>> @@ -1202,6 +1202,61 @@ static void test_migrate_auto_converge(void)
>> test_migrate_end(from, to, true);
>> }
>>
>> +static void test_multifd_tcp(void)
>> +{
>> + MigrateStart *args = migrate_start_new();
>> + QTestState *from, *to;
>> + QDict *rsp;
>> + char *uri;
>> +
>> + if (test_migrate_start(&from, &to, "defer", args)) {
>> + 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_int(from, "downtime-limit", 1);
>> + /* 1GB/s */
>> + migrate_set_parameter_int(from, "max-bandwidth", 1000000000);
>> +
>> + migrate_set_parameter_int(from, "multifd-channels", 16);
>> + migrate_set_parameter_int(to, "multifd-channels", 16);
>> +
>> + migrate_set_capability(from, "multifd", "true");
>> + migrate_set_capability(to, "multifd", "true");
>> +
>> + /* Start incoming migration from the 1st socket */
>> + rsp = wait_command(to, "{ 'execute': 'migrate-incoming',"
>> + " 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}");
>> + qobject_unref(rsp);
>> +
>> + /* Wait for the first serial output from the source */
>> + wait_for_serial("src_serial");
>> +
>> + uri = migrate_get_socket_address(to, "socket-address");
>> +
>> + migrate_qmp(from, uri, "{}");
>> +
>> + wait_for_migration_pass(from);
>> +
>> + /* 300ms it should converge */
>> + migrate_set_parameter_int(from, "downtime-limit", 600);
>
> Comment doesn't quite match here; but other than that;
Fixed code, thanks.
© 2016 - 2026 Red Hat, Inc.