We set multifd-channels.
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Juan Quintela <quintela@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 0b25aa3d6c..ff480e0682 100644
--- a/tests/migration-test.c
+++ b/tests/migration-test.c
@@ -1028,6 +1028,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, 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_int(from, "downtime-limit", 1);
+ /* 1GB/s */
+ migrate_set_parameter_int(from, "max-bandwidth", 1000000000);
+
+ migrate_set_parameter_int(from, "multifd-channels", 2);
+ migrate_set_parameter_int(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_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);
+}
+
int main(int argc, char **argv)
{
char template[] = "/tmp/migration-test-XXXXXX";
@@ -1082,6 +1129,7 @@ int main(int argc, char **argv)
qtest_add_func("/migration/precopy/tcp", test_precopy_tcp);
/* qtest_add_func("/migration/ignore_shared", test_ignore_shared); */
qtest_add_func("/migration/xbzrle/unix", test_xbzrle_unix);
+ qtest_add_func("/migration/multifd/tcp", test_multifd_tcp);
ret = g_test_run();
--
2.21.0
On Wed, May 15, 2019 at 02:15:39PM +0200, Juan Quintela wrote:
>We set multifd-channels.
>
>Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>Reviewed-by: Thomas Huth <thuth@redhat.com>
>Signed-off-by: Juan Quintela <quintela@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 0b25aa3d6c..ff480e0682 100644
>--- a/tests/migration-test.c
>+++ b/tests/migration-test.c
>@@ -1028,6 +1028,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, 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_int(from, "downtime-limit", 1);
>+ /* 1GB/s */
>+ migrate_set_parameter_int(from, "max-bandwidth", 1000000000);
>+
>+ migrate_set_parameter_int(from, "multifd-channels", 2);
>+ migrate_set_parameter_int(to, "multifd-channels", 2);
>+
>+ migrate_set_capability(from, "multifd", "true");
>+ migrate_set_capability(to, "multifd", "true");
Hi, Juan
In case to test multifd, what's the minimum configuration? Set multifd
capability at both side is fine?
>+ /* 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_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);
>+}
>+
> int main(int argc, char **argv)
> {
> char template[] = "/tmp/migration-test-XXXXXX";
>@@ -1082,6 +1129,7 @@ int main(int argc, char **argv)
> qtest_add_func("/migration/precopy/tcp", test_precopy_tcp);
> /* qtest_add_func("/migration/ignore_shared", test_ignore_shared); */
> qtest_add_func("/migration/xbzrle/unix", test_xbzrle_unix);
>+ qtest_add_func("/migration/multifd/tcp", test_multifd_tcp);
>
> ret = g_test_run();
>
>--
>2.21.0
>
--
Wei Yang
Help you, Help me
Wei Yang <richardw.yang@linux.intel.com> wrote:
> On Wed, May 15, 2019 at 02:15:39PM +0200, Juan Quintela wrote:
>>We set multifd-channels.
>>
>>Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>>Reviewed-by: Thomas Huth <thuth@redhat.com>
>>Signed-off-by: Juan Quintela <quintela@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 0b25aa3d6c..ff480e0682 100644
>>--- a/tests/migration-test.c
>>+++ b/tests/migration-test.c
>>@@ -1028,6 +1028,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, 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_int(from, "downtime-limit", 1);
>>+ /* 1GB/s */
>>+ migrate_set_parameter_int(from, "max-bandwidth", 1000000000);
>>+
>>+ migrate_set_parameter_int(from, "multifd-channels", 2);
>>+ migrate_set_parameter_int(to, "multifd-channels", 2);
>>+
>>+ migrate_set_capability(from, "multifd", "true");
>>+ migrate_set_capability(to, "multifd", "true");
>
> Hi, Juan
>
> In case to test multifd, what's the minimum configuration? Set multifd
> capability at both side is fine?
It is required. For older configuration, we are a bit more lax about
that requirement. For anything new, we want it to be set in both sides.
Thanks, Juan.
On Wed, May 15, 2019 at 02:15:39PM +0200, Juan Quintela wrote:
>We set multifd-channels.
>
>Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>Reviewed-by: Thomas Huth <thuth@redhat.com>
>Signed-off-by: Juan Quintela <quintela@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 0b25aa3d6c..ff480e0682 100644
>--- a/tests/migration-test.c
>+++ b/tests/migration-test.c
>@@ -1028,6 +1028,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, 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_int(from, "downtime-limit", 1);
>+ /* 1GB/s */
>+ migrate_set_parameter_int(from, "max-bandwidth", 1000000000);
>+
>+ migrate_set_parameter_int(from, "multifd-channels", 2);
>+ migrate_set_parameter_int(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_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);
Miss free uri here?
g_free(uri);
And
Tested-by: Wei Yang <richardw.yang@linux.intel.com>
>+}
>+
> int main(int argc, char **argv)
> {
> char template[] = "/tmp/migration-test-XXXXXX";
>@@ -1082,6 +1129,7 @@ int main(int argc, char **argv)
> qtest_add_func("/migration/precopy/tcp", test_precopy_tcp);
> /* qtest_add_func("/migration/ignore_shared", test_ignore_shared); */
> qtest_add_func("/migration/xbzrle/unix", test_xbzrle_unix);
>+ qtest_add_func("/migration/multifd/tcp", test_multifd_tcp);
>
> ret = g_test_run();
>
>--
>2.21.0
>
--
Wei Yang
Help you, Help me
Wei Yang <richardw.yang@linux.intel.com> wrote:
> On Wed, May 15, 2019 at 02:15:39PM +0200, Juan Quintela wrote:
>>We set multifd-channels.
>>
>>+ wait_for_serial("dest_serial");
>>+ wait_for_migration_complete(from);
>>+
>>+ test_migrate_end(from, to, true);
>
> Miss free uri here?
>
> g_free(uri);
You are right.
Fixed.
>
> And
>
> Tested-by: Wei Yang <richardw.yang@linux.intel.com>
Thanks.
© 2016 - 2026 Red Hat, Inc.